diff options
author | João Henrique Ferreira de Freitas <joaohf@gmail.com> | 2014-03-29 00:12:04 -0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-30 10:10:35 +0100 |
commit | 550e9317348dd6254c9dd55fa425b92f278b7c7a (patch) | |
tree | 059bdaf0a9d720897d9318a597a8fe033aca21a9 /scripts/lib | |
parent | 25d16c493412bdec11fd169edc92ce6df9338020 (diff) | |
download | poky-550e9317348dd6254c9dd55fa425b92f278b7c7a.tar.gz |
wic: Add rootfs_dir argument to do_prepare_partition() method
The do_prepare_partition() method from RootfsPlugin class need
to know what will be the rootfs_dir. This makes sense when .wks
file has a partition set up like this:
part /standby --source rootfs --rootfs-dir=<special rootfs> ...
then do_prepare_partition() will work with the correct rootfs.
(From OE-Core rev: 6042b097a8fc24f2b85eb9848fb007a3c6c090a9)
Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/mic/pluginbase.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-efi.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-pcbios.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/mic/pluginbase.py b/scripts/lib/mic/pluginbase.py index e26b525dc3..9cf4c628d1 100644 --- a/scripts/lib/mic/pluginbase.py +++ b/scripts/lib/mic/pluginbase.py | |||
@@ -126,7 +126,7 @@ class SourcePlugin(_Plugin): | |||
126 | 126 | ||
127 | @classmethod | 127 | @classmethod |
128 | def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, | 128 | def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, |
129 | kernel_dir, native_sysroot): | 129 | kernel_dir, rootfs_dir, native_sysroot): |
130 | """ | 130 | """ |
131 | Called to do the actual content population for a partition i.e. it | 131 | Called to do the actual content population for a partition i.e. it |
132 | 'prepares' the partition to be incorporated into the image. | 132 | 'prepares' the partition to be incorporated into the image. |
diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py index 1974b062b2..2cc179a337 100644 --- a/scripts/lib/mic/plugins/source/bootimg-efi.py +++ b/scripts/lib/mic/plugins/source/bootimg-efi.py | |||
@@ -96,7 +96,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
96 | 96 | ||
97 | @classmethod | 97 | @classmethod |
98 | def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, | 98 | def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, |
99 | kernel_dir, native_sysroot): | 99 | kernel_dir, rootfs_dir, native_sysroot): |
100 | """ | 100 | """ |
101 | Called to do the actual content population for a partition i.e. it | 101 | Called to do the actual content population for a partition i.e. it |
102 | 'prepares' the partition to be incorporated into the image. | 102 | 'prepares' the partition to be incorporated into the image. |
diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index fad150f940..1211e5c93b 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py | |||
@@ -124,7 +124,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
124 | 124 | ||
125 | @classmethod | 125 | @classmethod |
126 | def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, | 126 | def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, |
127 | kernel_dir, native_sysroot): | 127 | kernel_dir, rootfs_dir, native_sysroot): |
128 | """ | 128 | """ |
129 | Called to do the actual content population for a partition i.e. it | 129 | Called to do the actual content population for a partition i.e. it |
130 | 'prepares' the partition to be incorporated into the image. | 130 | 'prepares' the partition to be incorporated into the image. |