summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins
diff options
context:
space:
mode:
authorPaul Barker <pbarker@konsulko.com>2020-01-08 11:25:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-10 21:18:22 +0000
commit2c814462484e51d80f354fc3a28fdfb9aa396a5e (patch)
tree31b74368572c91731e8ad58e5f2b68e1c5bc5c59 /scripts/lib/wic/plugins
parentab6e8dae1e9e3c96cd003b21825df61f553ebdc8 (diff)
downloadpoky-2c814462484e51d80f354fc3a28fdfb9aa396a5e.tar.gz
wic: Add --include-path argument
This option adds the contents of the given path to a partition built with the rootfs source plugin. The path is relative to the directory in which wic is running not the rootfs itself so use of an absolute path is recommended. This option is most useful when multiple copies of the rootfs are added to an image and it is required to add extra content to only one of these copies. This option only has an effect with the rootfs source plugin. (From OE-Core rev: d4cd27a9837426e809190548a83c6c7c76505114) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugins')
-rw-r--r--scripts/lib/wic/plugins/source/rootfs.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index e26e95b991..705aeb5563 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin):
71 71
72 new_rootfs = None 72 new_rootfs = None
73 # Handle excluded paths. 73 # Handle excluded paths.
74 if part.exclude_path is not None: 74 if part.exclude_path or part.include_path:
75 # We need a new rootfs directory we can delete files from. Copy to 75 # We need a new rootfs directory we can delete files from. Copy to
76 # workdir. 76 # workdir.
77 new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) 77 new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno))
@@ -81,7 +81,10 @@ class RootfsPlugin(SourcePlugin):
81 81
82 copyhardlinktree(part.rootfs_dir, new_rootfs) 82 copyhardlinktree(part.rootfs_dir, new_rootfs)
83 83
84 for orig_path in part.exclude_path: 84 for path in part.include_path or []:
85 copyhardlinktree(path, new_rootfs)
86
87 for orig_path in part.exclude_path or []:
85 path = orig_path 88 path = orig_path
86 if os.path.isabs(path): 89 if os.path.isabs(path):
87 logger.error("Must be relative: --exclude-path=%s" % orig_path) 90 logger.error("Must be relative: --exclude-path=%s" % orig_path)