From e00e902fc7f91be415682e084c839bce7bb64d3f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 11 Aug 2014 20:35:37 -0500 Subject: wic: Add sourceparam param to partition plugin methods The sourceparam param allows source plugins to be parameterized generically (via --sourceparams="key=val[,key=val], implemented previously). (From OE-Core rev: 2abbcc843ba888782f6d68748d930c81e6ae7040) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/bootimg-efi.py | 10 ++++++---- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 10 ++++++---- scripts/lib/wic/plugins/source/rootfs.py | 5 +++-- 3 files changed, 15 insertions(+), 10 deletions(-) (limited to 'scripts/lib/wic/plugins') diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 53f1782381..ea94fd2424 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -42,8 +42,9 @@ class BootimgEFIPlugin(SourcePlugin): name = 'bootimg-efi' @classmethod - def do_configure_partition(self, part, cr, cr_workdir, oe_builddir, - bootimg_dir, kernel_dir, native_sysroot): + def do_configure_partition(self, source_params, part, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + native_sysroot): """ Called before do_prepare_partition(), creates grubefi config """ @@ -92,8 +93,9 @@ class BootimgEFIPlugin(SourcePlugin): cfg.close() @classmethod - def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, - kernel_dir, rootfs_dir, native_sysroot): + def do_prepare_partition(self, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + rootfs_dir, native_sysroot): """ Called to do the actual content population for a partition i.e. it 'prepares' the partition to be incorporated into the image. diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index bd2225eeaf..aceed20428 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -65,8 +65,9 @@ class BootimgPcbiosPlugin(SourcePlugin): raise ImageError("Unable to set MBR to %s" % full_path) @classmethod - def do_configure_partition(self, part, cr, cr_workdir, oe_builddir, - bootimg_dir, kernel_dir, native_sysroot): + def do_configure_partition(self, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + native_sysroot): """ Called before do_prepare_partition(), creates syslinux config """ @@ -118,8 +119,9 @@ class BootimgPcbiosPlugin(SourcePlugin): cfg.close() @classmethod - def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, - kernel_dir, rootfs_dir, native_sysroot): + def do_prepare_partition(self, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + rootfs_dir, native_sysroot): """ Called to do the actual content population for a partition i.e. it 'prepares' the partition to be incorporated into the image. diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 919e97e6b6..a432a18705 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -62,8 +62,9 @@ class RootfsPlugin(SourcePlugin): return image_rootfs_dir @classmethod - def do_prepare_partition(self, part, cr, cr_workdir, oe_builddir, bootimg_dir, - kernel_dir, krootfs_dir, native_sysroot): + def do_prepare_partition(self, part, source_params, cr, cr_workdir, + oe_builddir, bootimg_dir, kernel_dir, + krootfs_dir, native_sysroot): """ Called to do the actual content population for a partition i.e. it 'prepares' the partition to be incorporated into the image. -- cgit v1.2.3-54-g00ecf