From: Ricardo Ribalda Delgado <ricardo.riba...@gmail.com>
If an excuded path does not exist, continue without an error.
This allows to seamleasly reuse .wks among different projects.
Eg:
part / --source rootfs --fstype=ext4 --exclude-path=opt/private_keys
Where /opt/private_keys in only populated by some of the image.bb files.
Cc: Paul Barker <pbar...@konsulko.com>
Signed-off-by: Ricardo Ribalda Delgado <rica...@ribalda.com>
---
scripts/lib/wic/plugins/source/rootfs.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/wic/plugins/source/rootfs.py
b/scripts/lib/wic/plugins/source/rootfs.py
index 85c634f8a1..247f61ff7c 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -136,7 +136,6 @@ class RootfsPlugin(SourcePlugin):
sys.exit(1)
full_path = os.path.realpath(os.path.join(new_rootfs, path))
-
# Disallow climbing outside of parent directory using '..',
# because doing so could be quite disastrous (we will delete
the
# directory).
@@ -144,6 +143,9 @@ class RootfsPlugin(SourcePlugin):
logger.error("'%s' points to a path outside the rootfs" %
orig_path)
sys.exit(1)
+ if not os.path.lexists(full_path):
+ continue
+
if path.endswith(os.sep):
# Delete content only.
for entry in os.listdir(full_path):
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#137304):
https://lists.openembedded.org/g/openembedded-core/message/137304
Mute This Topic: https://lists.openembedded.org/mt/73123273/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
