mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-29 18:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: Add --include-path argument

Browse Source 
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>
This commit is contained in:
Paul Barker
2020-01-08 11:25:46 +00:00
committed by Richard Purdie
parent ab6e8dae1e
commit 2c81446248
5 changed files with 72 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/lib/wic/help.py
View File

@@ -969,6 +969,16 @@ DESCRIPTION
is omitted, not the directory itself. This option only
has an effect with the rootfs source plugin.
--include-path: This option is specific to wic. It adds the contents
of the given path to the resulting image. 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.
--extra-space: This option is specific to wic. It adds extra
space after the space filled by the content
of the partition. The final size can go

1
scripts/lib/wic/ksparser.py
View File

@@ -137,6 +137,7 @@ class KickStart():
part.add_argument('--active', action='store_true')
part.add_argument('--align', type=int)
part.add_argument('--exclude-path', nargs='+')
part.add_argument('--include-path', nargs='+')
part.add_argument("--extra-space", type=sizetype)
part.add_argument('--fsoptions', dest='fsopts')
part.add_argument('--fstype', default='vfat',

1
scripts/lib/wic/partition.py
View File

@@ -30,6 +30,7 @@ class Partition():
self.device = None
self.extra_space = args.extra_space
self.exclude_path = args.exclude_path
self.include_path = args.include_path
self.fsopts = args.fsopts
self.fstype = args.fstype
self.label = args.label

7
scripts/lib/wic/plugins/source/rootfs.py
View File

@@ -71,7 +71,7 @@ class RootfsPlugin(SourcePlugin):
new_rootfs = None
# Handle excluded paths.
if part.exclude_path is not None:
if part.exclude_path or part.include_path:
# We need a new rootfs directory we can delete files from. Copy to
# workdir.
new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno))
@@ -81,7 +81,10 @@ class RootfsPlugin(SourcePlugin):
copyhardlinktree(part.rootfs_dir, new_rootfs)
for orig_path in part.exclude_path:
for path in part.include_path or []:
copyhardlinktree(path, new_rootfs)
for orig_path in part.exclude_path or []:
path = orig_path
if os.path.isabs(path):
logger.error("Must be relative: --exclude-path=%s" % orig_path)