[OE-core] [PATCH 07/18] wic: pylinted direct_plugin

Fixed wrong continued indentation, unused import and trailing new line pyling warnings. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct_plugin.py | 22 +++--- 1 file changed, 7 insertions(+), 15 deletions(-)

[OE-core] [PATCH 06/18] wic: improve naming in direct_plugin classes

Synchronized attribure names in DirectImageCreator and DirectPlugin for better readability. Simplified code, removed unneeded global variable disk_methods. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct_plugin.py | 62 +-

[OE-core] [PATCH 10/18] wic: removed test file

This file is not used anywhere in the wic code. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/test | 1 - 1 file changed, 1 deletion(-) delete mode 100644 scripts/lib/wic/test diff --git a/scripts/lib/wic/test b/scripts/lib/wic/test delete

[OE-core] [PATCH 12/18] wci: misc: removed build_name API

This API is not used in wic code. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/misc.py | 39 --- 1 file changed, 39 deletions(-) diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/m

[OE-core] [PATCH 15/18] wic: removed code from __init__.py

The code deals with non-existing directory and can be removed. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/__init__.py | 4 1 file changed, 4 deletions(-) diff --git a/scripts/lib/wic/__init__.py b/scripts/lib/wic/__init__.py index 6

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

BTW, to be consistent with this approach we also need to rename image-live and image-vm, right? Actually, image-live name was the reason for me to name image-wic. On Mon, Jan 30, 2017 at 11:07:22AM -0800, Rick Altherr wrote: > LGTM > > On Mon, Jan 30, 2017 at 10:42 AM, Ed Bartosh

[OE-core] [PATCH 16/18] wic: msger.py: remove unused APIs

Removed unused enable_logstderr and disable_logstderr APIs. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/msger.py | 26 -- 1 file changed, 26 deletions(-) diff --git a/scripts/lib/wic/msger.py b/scripts/lib/wic/msger.py

[OE-core] [PATCH 17/18] wic: code cleanup

Fixed indentation, unused imports, trailing lines etc. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/__version__.py | 1 - scripts/lib/wic/engine.py| 2 +- scripts/lib/wic/h

[OE-core] [PATCH 14/18] wic: move oe/misc.py one level up

Flattened directory structure: moved wic/utils/oe/misc.py -> wic/utils/misc.py [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py| 4 ++-- scripts/lib/wic/partition.py | 4 ++-- sc

[OE-core] [PATCH 18/18] wic: remove syslinux.py

This module contains singe function serial_console_form_kargs, which is used only by rootfs_pcbios_ext plugin. Moved it there and removed syslinux module to make it easy to find and mainain plugin code. [YOCTO #10619] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- .../l

[OE-core] [PATCH 6/9] wic: make sure layout_partitions is called once

Removed artificial _partitions_layed_out attribute and unneeded call of layout_partitions method. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/partitionedfs.py | 12 1 file changed, 12 deletions(-) diff --git a/scripts/lib/wic

[OE-core] [PATCH 8/9] wic: direct: remove unused import

Removed unused import of wic.errors module. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/

[OE-core] [PATCH 9/9] wic: remove unused argument scripts_path

There is no need to pass scripts_path from main wic module down the stack as it's not used there. Removed scripts_path argument from DirectPlugin class and wic_create function. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py

[OE-core] [PATCH 7/9] wic: direct: remove unused plugin attributes

Removed unused _disks, _disk_format and _disk_names attributes from DirectPlugin class. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct.py | 4 1 file changed, 4 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/s

[OE-core] [PATCH 5/9] wic: use the same partition object in direct and partitionedfs

Partition attributes were copied to the dictionary in partitionedfs code, which makes the code hard to follow. Used partition object passed from direct.py module as is in partitionedfs. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/partition.py

[OE-core] [PATCH 3/9] wic: partitionedfs: rename __create_partition and __add_disk

Renamed private methods with leading double underscores: __create_partition -> _create_partition __add_disk -> _add_disk There is no point to have those names mangled, one underscore is enough. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/part

[OE-core] [PATCH 4/9] wic: direct: get rid of _get_parts getter

Replaced _get_parts getter with direct attribute access to self.parts Removed code that implicitly created partition if there are no partitions mentioned in .wks file Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct.p

[OE-core] [PATCH 1/9] wic: partitionedfs: merged __format_disks and create

Private method __format_disks is called only from create method making the code less readable. Merged the code into one method. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/partitionedfs.py | 15 +-- 1 file changed, 5 insertions(+), 10 del

[OE-core] [PATCH 2/9] wic: partitionedfs: get rid of __add_partition

3 lines long private method __add_partition is called only from add_partition method. Merged them together to increase readability. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/partitionedfs.py | 14 -- 1 file changed, 4 insertions(+), 10 del

[OE-core] [PATCH 0/9] #10619: refactor wic codebase (continuation)

instead of bash (2017-02-07 14:50:10 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (9): wic: partitionedfs: merged __format_disks and create wic

[OE-core] [PATCH 1/3] wic: engine: create output dir

Make sure output directory exists before creating an image. Create it if it doesn't exist. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py

[OE-core] [PATCH 3/3] wic: get rid of image_output_dir variable

Used options.outdir instead of image_output_dir. There is no sense to use extra variable for this. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/wic | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/wic b/scripts/wic index 33355ee..1

[OE-core] [PATCH 2/3] wic: direct: fix creation of work directory

space issues as mkdtemp uses TMPDIR, TEMP or TMP environment variables to get default value of its 'dir' parameter. Those variables are usually pointing to /tmp, which is not the best location to create huge images. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/l

[OE-core] [PATCH 0/3] wic: fix creation of working directory

/refactoring-10619 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/refactoring-10619 Ed Bartosh (3): wic: engine: create output dir wic: direct: fix creation of work directory wic: get rid of image_output_dir variable scripts/lib/wic/engine.py| 3

[OE-core] [PATCH] image: rename image-wic -> image_types_wic

Make name of the wic image type class consistent with existing naming scheme for image types. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image.bbclass | 5 +++-- meta/classes/{image-wic.bbclass => image_types_wic.bbclass} | 0

[OE-core] [PATCH] selftest: wic: stop using hddimg in FSTYPES

Removed hddimg from FSTYPES in wic test suite as wic doesn't depend on hddimg anymore. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/se

Re: [OE-core] [PATCH v4 2/2] selftest/wic: Add tests for --exclude-dir option.

On Mon, Feb 06, 2017 at 05:16:45PM +0100, Kristian Amlie wrote: > > Rebased and reran tests. Changes since last patchset: > > - Because of recipe specific sysroots we now need to import the PATH > used by wic-tools into the test in order to use its tools. > > - Add specific '-o' parameter

[OE-core] [PATCH] selftest: wic: stop using iso image type

Removed 'IMAGE_FSTYPES = "iso" as this functionality depends on do_bootimg, which is going to be obsoleted soon. As wic doesn't depend on bootimg it's safe to remove this. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 6 +++--- 1

[OE-core] [PATCH] selftest: wic: use wic-tools recipe to get STAGING_DIR

STAGING_DIR variable is used to get path to a boot dir. It's better to use wic-tools recipe to it as it contains all bootloader artifacts. Modified test_build_artifacts and test_rootfs_artifacts to use wic-tools target to get STAGING_DIR. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.

[OE-core] [PATCH] wic: isoimage-isohybrid: use wic-tools to get syslinux path

wic-tools recipe specific sysroot contains syslinux as wic-tools depends on it. Used wic-tools target to get syslinux path should guarantee that syslinux is installed there and can be used. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/is

[OE-core] [PATCH] wic: fix call of serial_console_form_kargs

As syslinux module has been recently removed and serial_consloe_form_kargs became local API in rootfs_pcbios_ext plugin it should be called without syslinux. prefix. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 2 +-

Re: [OE-core] How to use WIC to generate raw flash images

On Fri, Jan 20, 2017 at 10:37:15AM -0800, Rick Altherr wrote: > For OpenBMC (based on Yocto), the target is an SoC that has an external > boot flash connected via SPI. Right now, we have a class ( > https://github.com/openbmc/openbmc/blob/master/meta-phosphor/classes/image-overlay.bbclass) > used

Re: [OE-core] How to use WIC to generate raw flash images

On Tue, Jan 24, 2017 at 09:56:17AM +0100, Mike Looijmans wrote: > On 23-01-17 11:34, Ed Bartosh wrote: > ... > >>- How do I set padding to be 0xFF instead of 0x00? > >The same thing here. Currently wic images are sparse files created by > >os.ftruncate, but it's

Re: [OE-core] [PATCH] wic: partitionedfs: set partition name for gpt partitions

Hi Jukka, On Thu, Jan 26, 2017 at 05:43:33PM +0200, Jukka Laitinen wrote: > Set proper gpt partition name for the partitions in case given > in the configuration > > Signed-off-by: Jukka Laitinen > --- > scripts/lib/wic/utils/partitionedfs.py | 7 +++ > 1 file

[OE-core] [PATCH v2 06/14] systemd-boot: make do_efi_populate depend on do_deploy

Added dependency do_efi_populate -> systemd-boot:do_deploy to make sure EFI artifacts are depfloyed. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/systemd-boot.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/systemd-boot.bbclass b/met

[OE-core] [PATCH v2 08/14] image-wic: add task do_build_iso

This task is needed to provide iso artifacts for isoimage-isohybrid wic plugin. Currently this pluing uses hddimg, which is going to be dropped from the codebase soon. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass | 9 +

[OE-core] [PATCH v2 12/14] isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH

image name. Replaced MACHINE_ARCH->TRANSLATED_TARGET_ARCH in WICVARS variable to make it available from .env file. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass | 4 ++-- scripts/lib/wic/plugins/source/isoimage-isohybr

[OE-core] [PATCH v2 10/14] wic: isoimage-isohybrid: stop using HDDDIR

#10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/is

[OE-core] [PATCH v2 11/14] image-wic: remove HDDDIR from WICVARS

Removed HDDDIR as it's not used by wic anymore. Stopped usage of HDDDIR in wic test suite. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass | 2 +- meta/lib/oeqa/selftest/wic.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

[OE-core] [PATCH v2 02/14] grub-efi: set default desination dir

to install EFI artifacts. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/grub-efi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 3dc9146..48b4b34 100644 --- a/meta/classe

[OE-core] [PATCH v2 03/14] systemd-boot: set default desination dir

to install EFI artifacts. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/systemd-boot.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass index 6a2cbc8..1405310 100644 ---

[OE-core] [PATCH v2 04/14] image-wic.bbclas: add task do_efi_populate

Produce EFI artifacts by calling efi_populate function provided by current EFI provider. This should eliminate dependency of wic image-efi plugin to hddimg. Instead of getting EFI artifacts from HDDDIR it can get it from $WORKDIR/efi. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.b

[OE-core] [PATCH v2 07/14] wic: use EFI artifacts from $WORKDIR/efi

Made bootimg-efi to use EFI artifacts from $WORKDIR/efi instead of $HDDDIR. This should eliminate its dependency on hddimg functionality which is going to be removed soon. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/bootimg-efi.

[OE-core] [PATCH v2 09/14] wic: use INITRD_LIVE in isoimage-isohybrid

INITRD variable is not set if hddimg is disabled. isoimage-isohybrid can't get correct name for initrd if INITRD variable is not set. Added INITRD_LIVE to WICVARS and used it in isoimage-isohybrid code to get initrd artifact name. Used INITRD if INITRD_LIVE is not set. Signed-off-by: Ed Bartosh

[OE-core] [PATCH v2 05/14] grub-efi: make do_efi_populate depend on do_deploy

Added dependency do_efi_populate -> grub-efi:do_deploy to make sure EFI artifacts are depfloyed. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/grub-efi.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/grub-efi.bbclass b/meta/cla

[OE-core] [PATCH v2 01/14] image-wic: move wic code to image-wic.bbclass

There is a lot of wic code in image.bbclass and image_types.bbclass Having all code separated in one file should make it more readable and easier to maintain. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass

[OE-core] [PATCH v2 00/14] Fix for #10835 - WIC should not rely on hddimg creation for finding all needed artifacts

70c6fa0f9eefa2233cbdcbba5271d57a74393471: selftest: wic: split test_debug test case (2017-01-26 13:27:34 +0200) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (14): image-wic

[OE-core] [PATCH] selftest: wic: split test_debug test case

c.py", line 270, in test_debug self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct"))) AssertionError: 1 != 2 Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 7 +-- 1 file changed, 5 insertions(+), 2 dele

[OE-core] [PATCH v2 13/14] selftest: stop using hddimg in the wic test suite

Removed hddimg from IMAGE_FEATURES as wic code doesn't use hddimg anymore. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/li

[OE-core] [PATCH v2 14/14] selftest: wic: fix test_iso_image test case

Added "iso" to IMAGE_FSTYPES to build iso artifacts required to fix test of isoimage-isohybrid wic plugin. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

class and image_types.class then we can just drop this patch. However, I personally find it more maintainable this way. Suggesting people to change machine configs just because wic code is moved to separate file doesn't look good to me either. > On Mon, Jan 30, 2017 at 9:45 AM, Ed Bartosh <ed

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

ame with a dash in it. > Thanks for pointing out to it. Will fix it in the next versison of this patchset. > -- > Ola x Nilsson > > > -Original Message- > > From: openembedded-core-boun...@lists.openembedded.org > > [mailto:openembedded-core-boun...@lists.openembedded.org]

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

works just fine. Why to change? > On Mon, Jan 30, 2017 at 9:18 AM, Ed Bartosh <ed.bart...@linux.intel.com> > wrote: > > > On Mon, Jan 30, 2017 at 09:27:54AM -0800, Rick Altherr wrote: > > > Why didn't you make this image_types_wic.bbclass and use IMAGE_CLASSES

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

re explicit than IMAGE_CLASSES += "image_types"\n inherit ${IMAGE_CLASSES} > > On Fri, Jan 27, 2017 at 12:19 PM, Ed Bartosh <ed.bart...@linux.intel.com> > wrote: > > > There is a lot of wic code in image.bbclass and image_types.bbclass > > Having all

Re: [OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

he same as 'inherit image_type_wic', just takes 2 lines, but looks more consistent. does this look ok? > On Mon, Jan 30, 2017 at 10:15 AM, Ed Bartosh <ed.bart...@linux.intel.com> > wrote: > > > On Mon, Jan 30, 2017 at 10:25:59AM -0800, Rick Altherr wrote: > > >

[OE-core] [PATCH] toolchain-shar-extract: compare SDK and host gcc versions

versions. Detected non-installable combinations of gcc versions and print an installation error. [YOCTO #10881] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/populate_sdk_base.bbclass | 1 + meta/files/toolchain-shar-extract.sh | 8 2 files changed, 9 inse

[OE-core] [PATCH] wic: change location of .env files

Current location of .env files $STAGING_DIR/imagedata. It doesn't depend on machine and be rewritten by the builds for different machines. Changed location to $STAGING_DIR/$MACHINE/imagedata to avoid .env files to be rewritten. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> ---

[OE-core] [PATCH v2] wic: change location of .env files

Current location of .env files $STAGING_DIR/imagedata. It doesn't depend on machine and be rewritten by the builds for different machines. Changed location to $STAGING_DIR/$MACHINE/imagedata to avoid .env files to be rewritten. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> ---

[OE-core] [PATCH v3] wic: change location of .env files

Current location of .env files $STAGING_DIR/imagedata. It doesn't depend on machine and be rewritten by the builds for different machines. Changed location to $STAGING_DIR/$MACHINE/imagedata to avoid .env files to be rewritten. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> ---

[OE-core] [PATCH v3 01/11] image-wic: move wic code to image-wic.bbclass

There is a lot of wic code in image.bbclass and image_types.bbclass Having all code separated in one file should make it more readable and easier to maintain. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass

[OE-core] [PATCH v3 00/11] Fix for #10835 - WIC should not rely on hddimg creation for finding all needed artifacts

17:27:30 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (10): image-wic: move wic code to image-wic.bbclass wic: use INITRD_LIVE in isoimage-isohybrid wic

[OE-core] [PATCH v3 06/11] isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH

image name. Replaced MACHINE_ARCH->TRANSLATED_TARGET_ARCH in WICVARS variable to make it available from .env file. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass | 4 ++-- scripts/lib/wic/plugins/source/isoimage-isohybr

[OE-core] [PATCH v3 05/11] wic: Look for image artifacts in a common location

rs put their binaries in DEPLOY_DIR_IMAGE and then wic will find them and place them in the image Signed-off-by: Alejandro Hernandez <alejandro.hernan...@linux.intel.com> Signed-off-by: Tom Zanussi <tom.zanu...@linux.intel.com> Signed-off-by: Saul Wold <s...@linux.intel.com> Signed-off

[OE-core] [PATCH v3 09/11] grub-efi.bbclass: use 'grub-efi-' prefix

grub-efi recipe added 'grub-efi-' prefix to the file name of efi binary. Changed grub-efi.bbclass accordingly. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/grub-efi.bbclass | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/classe

[OE-core] [PATCH v3 10/11] wic-tools: add dependency to systemd-boot

Added systemd-boot to the list of dependencies of wic-tools as wic bootimg-efi plugin depends on it. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/recipes-core/meta/wic-tools.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/me

[OE-core] [PATCH v3 11/11] isoimage-isohybrid: renamed variable hdd_dir

Renamed variable hdd_dir to deploy_dir as this variable is assigned to the value of DEPLOY_DIR_IMAGE. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff

[OE-core] [PATCH v3 03/11] wic: isoimage-isohybrid: stop using HDDDIR

#10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 10 ++ 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/is

[OE-core] [PATCH v3 02/11] wic: use INITRD_LIVE in isoimage-isohybrid

INITRD variable is not set if hddimg is disabled. isoimage-isohybrid can't get correct name for initrd if INITRD variable is not set. Added INITRD_LIVE to WICVARS and used it in isoimage-isohybrid code to get initrd artifact name. Used INITRD if INITRD_LIVE is not set. Signed-off-by: Ed Bartosh

[OE-core] [PATCH v3 08/11] selftest: wic: fix test_iso_image test case

Added "iso" to IMAGE_FSTYPES to build iso artifacts required to fix test of isoimage-isohybrid wic plugin. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa

[OE-core] [PATCH v3 07/11] selftest: stop using hddimg in the wic test suite

Removed hddimg from IMAGE_FEATURES as wic code doesn't use hddimg anymore. [YOCTO #10835] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/lib/oeqa/selftest/wic.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/li

[OE-core] [PATCH v3 04/11] image-wic: remove HDDDIR from WICVARS

Removed HDDDIR as it's not used by wic anymore. Stopped usage of HDDDIR in wic test suite. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image-wic.bbclass | 2 +- meta/lib/oeqa/selftest/wic.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff

[OE-core] [PATCH 4/6] wic: exec_native_cmd: fix undefined variable error

Defined variable 'out' to fix this exception: UnboundLocalError: local variable 'out' referenced before assignment Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/misc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/lib/wic/utils/misc.py b/s

[OE-core] [PATCH 2/6] wic: use image recipe sysroot as default

Switched from using wic-tools recipe sysroot to using image sysroot in wic script. This way is more logical and consistent with the way wic uses other artifacts. [YOCTO #11017] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/wic | 2 +- 1 file changed, 1 insertion

[OE-core] [PATCH 3/6] wic: exec_native_cmd: improve debug message

Added search paths to the debug message to make it easier to see where the native command is searched. [YOCTO #11017] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/l

[OE-core] [PATCH 5/6] wic: add WKS_FILE_DEPENDS variable

This variable should be used to specify dependencies that will be added to DEPENDS only if wic image build is 'active' i.e. when 'wic' is in IMAGE_FSTYPES. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 +- meta/c

[OE-core] [PATCH 6/6] wic: raise WicError instead of calling logger.error

Replaced forgotten calls of logger.error with raising WicError exception. Otherwise errors will be ignored. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 ++-- scripts/lib/wic/utils/misc.py| 2 +- 2

[OE-core] [PATCH 0/6] wic: fix for #11017

at: git://git.yoctoproject.org/poky-contrib ed/wic/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (6): wic: use 2 sysroots to find native executable wic: use image recipe sysroot as default wic: exec_native_cmd: improve debug message wic: exec_native_cmd

[OE-core] [PATCH 1/6] wic: use 2 sysroots to find native executable

executable. [YOCTO #11017] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/utils/misc.py | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 4b822f0..3bab2f1 100644 --- a/scrip

[OE-core] [PATCH] image_types_wic: fix expansion error

which triggered exception SyntaxError: invalid syntax (WKS_FULL_PATH, line 1) Using d.getVar('WKS_SEARCH_PATH') instead of directly referencing WKS_SEARCH_PATH variable should fix the issue. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image_types_wic.bbclass | 2 +-

Re: [OE-core] [PATCH 0/6] wic: fix for #11017

ure is most probably caused by patchset from this thread. Regards, Ed > On 21 February 2017 at 15:23, Ed Bartosh <ed.bart...@linux.intel.com> wrote: > > > Hi, > > > > This patchset improves handling of wic native tool dependencies and > > fixes minor b

[OE-core] [PATCH 2/2] wic: add more targets to directdisk syslinux config

Added 3 new targets to directdisk-bootloader-config.cfg to match hddimg syslinux config. This is a preparation for dropping hddimg in favor of wic. [YOCTO #11044] Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- .../canned-wks/directdisk-bootloader-config.cfg

[OE-core] [PATCH 0/2] fix #11044: wic should support multiple boot labels such as boot and install targets

g/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (2): wic: bootimg-pcbios: add support for syslinux vesamenu wic: add more targets to directdisk syslinux config .../canned-wks/directdisk-bootloader-config.cfg| 28 +- scripts/lib/wic/plugins/source/bootimg-pcbios

Re: [OE-core] [PATCH 0/6] wic: fix for #11017

On Wed, Feb 22, 2017 at 10:53:35PM +0200, Ed Bartosh wrote: > On Wed, Feb 22, 2017 at 04:38:55PM +, Burton, Ross wrote: > > Hi Ed, > > > > Something in your latest patchset is breaking selftest: > > > > https://autobuilder.yoctoproject.org/main/buil

Re: [OE-core] [PATCH 0/6] wic: fix for #11017

On Thu, Feb 23, 2017 at 12:18:04PM +0200, Ed Bartosh wrote: > On Wed, Feb 22, 2017 at 10:53:35PM +0200, Ed Bartosh wrote: > > On Wed, Feb 22, 2017 at 04:38:55PM +, Burton, Ross wrote: > > > Hi Ed, > > > > > > Something in your latest patchset is b

[OE-core] [PATCH v2] image_types_wic: fix expansion error

which triggered exception SyntaxError: invalid syntax (WKS_FULL_PATH, line 1) Calling d.getVar instead of directly referencing variables should fix the issue. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- meta/classes/image_types_wic.bbclass | 2 +- 1 file changed, 1 insertio

[OE-core] [PATCH 10/11] wic: raise WicError instead of ImageError and CreatorError

There is no need to raise special exceptions. Raising WicError should be enough. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugin.py | 4 ++-- scripts/lib/wic/plugins/imager/direct.py| 6 +++--- scripts/lib/wic/plugins/

[OE-core] [PATCH 11/11] wic: move WicError to lib/wic/__init__.py

Removed unused exceptions from error.py Moved definition of WicError to lib/wic/__init__.py Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/__init__.py| 20 +++ scripts/lib/wic/engine.py | 2 +- scrip

[OE-core] [PATCH 09/11] wic: raise WicError in wic plugins

Replaced sys.exit with raising WicError in wic plugins. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct.py | 6 +-- scripts/lib/wic/plugins/source/bootimg-efi.py | 32 +-- .../lib/wic/plugins/source/bootimg-partit

[OE-core] [PATCH 03/11] wic: use wic logger in imager direct plugin

Replaced msger with wic logger in the direct plugin. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/imager/direct.py | 83 +--- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/dir

[OE-core] [PATCH 08/11] wic: raise WicError in core modules

Replaced sys.exit with raising WicError in the core wic modules. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py | 21 --- scripts/lib/wic/partition.py| 46 +++-- scripts/lib/wic/utils/m

[OE-core] [PATCH 02/11] wic: use wic logger in core modules

Replaced msger with wic logger in the core wic modules. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py | 19 ++- scripts/lib/wic/help.py | 8 +++-- scripts/lib/wic/ksparser.py | 7 ++-- scripts/lib/wic/partition.py

[OE-core] [PATCH 07/11] wic: raise WicError in main module

Replaced sys.exit with raising WicError in main module. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/wic | 56 +++- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/scripts/wic b/scripts/wic index b

[OE-core] [PATCH 04/11] wic: use wic logger in wic source plugins

Replaced msger with wic logger in wic source plugins. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/plugins/source/bootimg-efi.py | 60 -- .../lib/wic/plugins/source/bootimg-partition.py| 28 --- scripts/lib/wic/plugins/source/b

[OE-core] [PATCH 01/11] wic: setup logging in the main wic module

Set up wic logger using standerd logging module. This is going to replace custom msger module. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/wic | 77 +++-- 1 file changed, 44 insertions(+), 33 deletions(-) diff

[OE-core] [PATCH 00/11] wic refactoring (almost done)

creation of PartitionedImage to __init__ (2017-02-10 16:44:03 +0200) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip Ed Bartosh (11): wic: setup logging in the main wic module

[OE-core] [PATCH 05/11] wic: remove msger module

Removed custom logger module msger as it's replaced by wic logger. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py | 4 - scripts/lib/wic/msger.py | 209 -- 2 files changed, 213 deletions(-) delete mode

[OE-core] [PATCH 06/11] wic: move errors module

Moved from lib/wic/utils/ to lib/wic as this is a core module. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/{utils => }/errors.py | 0 scripts/lib/wic/plugin.py | 4 ++-- scripts/lib/wic/plugins/imager/direct.py

Re: [OE-core] [PATCH] wic/partionedfs: Avoid reserving space for non-existing ext. partition

Hi Kristian, Thank you for the patch. It looks good to me. Just one thing needs to be changed. See my comment below. On Thu, Feb 16, 2017 at 11:30:12AM +0100, Kristian Amlie wrote: > We don't need the gap that the extended partition occupies if we > already know that we have less than five

[OE-core] [PATCH 10/10] wic: pluginbase: use global dictionary

Made PluginMeta to populate global PLUGINS dictionary that is accessed by PluginMgr. This should make the code more understandable as PluginMgr don't need to get data directly from PlugnMeta attribute. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/pluginbase.p

[OE-core] [PATCH 02/10] wic: remove PluginMgr.get_source_plugins

Used get_plugins('source') instead of get_source_plugins to unify and simplify API to get plugins. Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com> --- scripts/lib/wic/engine.py| 2 +- scripts/lib/wic/partition.py | 2 +- scripts/lib/wic/plugin.py| 12 3

<    2   3   4   5   6   7   8   9   10   11   >