* [PATCH 0/4] Clean up some do_image_wic redundant code @ 2017-08-01 17:13 liu.ming50 2017-08-01 17:13 ` [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition liu.ming50 ` (3 more replies) 0 siblings, 4 replies; 10+ messages in thread From: liu.ming50 @ 2017-08-01 17:13 UTC (permalink / raw) To: openembedded-core; +Cc: Ming Liu From: Ming Liu <liu.ming50@gmail.com> Ming Liu (4): wic-image-minimal: drop WKS_FILE_DEPENDS definition image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT qemux86.conf: drop do_image_wic task dependencies qemux86-64.conf: drop do_image_wic task dependencies meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 -- meta/classes/image_types_wic.bbclass | 3 +-- meta/conf/machine/qemux86-64.conf | 1 - meta/conf/machine/qemux86.conf | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition 2017-08-01 17:13 [PATCH 0/4] Clean up some do_image_wic redundant code liu.ming50 @ 2017-08-01 17:13 ` liu.ming50 2017-08-02 8:38 ` Ed Bartosh 2017-08-01 17:13 ` [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT liu.ming50 ` (2 subsequent siblings) 3 siblings, 1 reply; 10+ messages in thread From: liu.ming50 @ 2017-08-01 17:13 UTC (permalink / raw) To: openembedded-core; +Cc: Ming Liu From: Ming Liu <peter.x.liu@external.atlascopco.com> It's being set in image_types_wic.bbclass, not need to double set it here, furthermore, the dependencies are incomplete by missing e2fsprogs-native. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> --- meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb index e1da203..af40d96 100644 --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb @@ -6,8 +6,6 @@ IMAGE_INSTALL = "packagegroup-core-boot" IMAGE_FSTYPES = "wic" -WKS_FILE_DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" - LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" IMAGE_ROOTFS_EXTRA_SPACE = "2000" -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition 2017-08-01 17:13 ` [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition liu.ming50 @ 2017-08-02 8:38 ` Ed Bartosh 0 siblings, 0 replies; 10+ messages in thread From: Ed Bartosh @ 2017-08-02 8:38 UTC (permalink / raw) To: liu.ming50; +Cc: Ming Liu, openembedded-core On Tue, Aug 01, 2017 at 07:13:47PM +0200, liu.ming50@gmail.com wrote: > From: Ming Liu <peter.x.liu@external.atlascopco.com> > > It's being set in image_types_wic.bbclass, not need to double set it > here, furthermore, the dependencies are incomplete by missing > e2fsprogs-native. > > Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> > --- > meta-selftest/recipes-test/images/wic-image-minimal.bb | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/meta-selftest/recipes-test/images/wic-image-minimal.bb b/meta-selftest/recipes-test/images/wic-image-minimal.bb > index e1da203..af40d96 100644 > --- a/meta-selftest/recipes-test/images/wic-image-minimal.bb > +++ b/meta-selftest/recipes-test/images/wic-image-minimal.bb > @@ -6,8 +6,6 @@ IMAGE_INSTALL = "packagegroup-core-boot" > > IMAGE_FSTYPES = "wic" > > -WKS_FILE_DEPENDS = "syslinux syslinux-native dosfstools-native mtools-native gptfdisk-native" > - > LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > > IMAGE_ROOTFS_EXTRA_SPACE = "2000" Please, consider adding e2fsprogs-native to the list instead of building extra packages that are not going to be used. -- Regards, Ed ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT 2017-08-01 17:13 [PATCH 0/4] Clean up some do_image_wic redundant code liu.ming50 2017-08-01 17:13 ` [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition liu.ming50 @ 2017-08-01 17:13 ` liu.ming50 2017-08-02 8:26 ` Ed Bartosh 2017-08-01 17:13 ` [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies liu.ming50 2017-08-01 17:13 ` [PATCH 4/4] qemux86-64.conf: " liu.ming50 3 siblings, 1 reply; 10+ messages in thread From: liu.ming50 @ 2017-08-01 17:13 UTC (permalink / raw) To: openembedded-core; +Cc: Ming Liu From: Ming Liu <peter.x.liu@external.atlascopco.com> Drop do_image_wic depends varflags, move the dependencies to WKS_FILE_DEPENDS_DEFAULT. I can not see the need to maintain them in two different ways, besides that it's out of USING_WIC control. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> --- meta/classes/image_types_wic.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index b825b47..7b0a1c7 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass @@ -39,9 +39,8 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" -do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}" -WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" +WKS_FILE_DEPENDS_DEFAULT = "parted-native gptfdisk-native dosfstools-native mtools-native syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" WKS_FILE_DEPENDS_BOOTLOADERS = "" WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT 2017-08-01 17:13 ` [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT liu.ming50 @ 2017-08-02 8:26 ` Ed Bartosh 2017-08-02 8:56 ` Ming Liu 0 siblings, 1 reply; 10+ messages in thread From: Ed Bartosh @ 2017-08-02 8:26 UTC (permalink / raw) To: liu.ming50; +Cc: Ming Liu, openembedded-core On Tue, Aug 01, 2017 at 07:13:48PM +0200, liu.ming50@gmail.com wrote: > From: Ming Liu <peter.x.liu@external.atlascopco.com> > > Drop do_image_wic depends varflags, move the dependencies to > WKS_FILE_DEPENDS_DEFAULT. I can not see the need to maintain them > in two different ways, besides that it's out of USING_WIC control. > > Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> > --- > meta/classes/image_types_wic.bbclass | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass > index b825b47..7b0a1c7 100644 > --- a/meta/classes/image_types_wic.bbclass > +++ b/meta/classes/image_types_wic.bbclass > @@ -39,9 +39,8 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" > USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" > WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" > do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" > -do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}" > > -WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" > +WKS_FILE_DEPENDS_DEFAULT = "parted-native gptfdisk-native dosfstools-native mtools-native syslinux-native bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" > WKS_FILE_DEPENDS_BOOTLOADERS = "" > WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" > WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" This breakes wic build on qemux86-64 target on my machine with the error: "ERROR: A native program parted required to build the image was not found (see details above)." -- Regards, Ed ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT 2017-08-02 8:26 ` Ed Bartosh @ 2017-08-02 8:56 ` Ming Liu 0 siblings, 0 replies; 10+ messages in thread From: Ming Liu @ 2017-08-02 8:56 UTC (permalink / raw) To: ed.bartosh; +Cc: Ming Liu, OE-core [-- Attachment #1: Type: text/plain, Size: 2266 bytes --] Hi, Ed: Thanks for testing it, I will investigate the cause and get back to you. the best, thank you 2017-08-02 10:26 GMT+02:00 Ed Bartosh <ed.bartosh@linux.intel.com>: > On Tue, Aug 01, 2017 at 07:13:48PM +0200, liu.ming50@gmail.com wrote: > > From: Ming Liu <peter.x.liu@external.atlascopco.com> > > > > Drop do_image_wic depends varflags, move the dependencies to > > WKS_FILE_DEPENDS_DEFAULT. I can not see the need to maintain them > > in two different ways, besides that it's out of USING_WIC control. > > > > Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> > > --- > > meta/classes/image_types_wic.bbclass | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/meta/classes/image_types_wic.bbclass > b/meta/classes/image_types_wic.bbclass > > index b825b47..7b0a1c7 100644 > > --- a/meta/classes/image_types_wic.bbclass > > +++ b/meta/classes/image_types_wic.bbclass > > @@ -39,9 +39,8 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH > WKS_FILES" > > USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' > '.join('wic.%s' % c for c in '${CONVERSIONTYPES}'.split()), '1', '', d)}" > > WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % > os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" > > do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" > > -do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' > % r for r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}" > > > > -WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native > cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" > > +WKS_FILE_DEPENDS_DEFAULT = "parted-native gptfdisk-native > dosfstools-native mtools-native syslinux-native bmap-tools-native > cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" > > WKS_FILE_DEPENDS_BOOTLOADERS = "" > > WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot" > > WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot" > > This breakes wic build on qemux86-64 target on my machine with the > error: "ERROR: A native program parted required to build the image was not > found (see details above)." > > -- > Regards, > Ed > [-- Attachment #2: Type: text/html, Size: 3242 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies 2017-08-01 17:13 [PATCH 0/4] Clean up some do_image_wic redundant code liu.ming50 2017-08-01 17:13 ` [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition liu.ming50 2017-08-01 17:13 ` [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT liu.ming50 @ 2017-08-01 17:13 ` liu.ming50 2017-08-02 8:35 ` Ed Bartosh 2017-08-01 17:13 ` [PATCH 4/4] qemux86-64.conf: " liu.ming50 3 siblings, 1 reply; 10+ messages in thread From: liu.ming50 @ 2017-08-01 17:13 UTC (permalink / raw) To: openembedded-core; +Cc: Ming Liu From: Ming Liu <peter.x.liu@external.atlascopco.com> They are being controlled by WKS_FILE_DEPENDS_DEFAULT, the code here is redundant and incomplete as well. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> --- meta/conf/machine/qemux86.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index c26dda2..f0bebbf 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -29,4 +29,3 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies 2017-08-01 17:13 ` [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies liu.ming50 @ 2017-08-02 8:35 ` Ed Bartosh 2017-08-02 9:36 ` Ming Liu 0 siblings, 1 reply; 10+ messages in thread From: Ed Bartosh @ 2017-08-02 8:35 UTC (permalink / raw) To: liu.ming50; +Cc: Ming Liu, openembedded-core On Tue, Aug 01, 2017 at 07:13:49PM +0200, liu.ming50@gmail.com wrote: > From: Ming Liu <peter.x.liu@external.atlascopco.com> > > They are being controlled by WKS_FILE_DEPENDS_DEFAULT, the code here > is redundant and incomplete as well. > > Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> > --- > meta/conf/machine/qemux86.conf | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf > index c26dda2..f0bebbf 100644 > --- a/meta/conf/machine/qemux86.conf > +++ b/meta/conf/machine/qemux86.conf > @@ -29,4 +29,3 @@ MACHINE_FEATURES += "x86" > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" > > WKS_FILE ?= "directdisk.wks" > -do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -1 WKS_FILE_DEPENDS_DEFAULT is a termporary setting aimed to easy transition from using wic-tools to using WKS_FILE_DEPENDS. It contains the whole set of packages that is not usually needed. Please, consider setting WKS_FILE_DEPENDS with the minimum set of packages required by directdisk.wks. This will faster the build as unneeded packages will not be built. You may want to look at "image_types_wic: set default WKS_FILE_DEPENDS" commit for further details. -- Regards, Ed ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies 2017-08-02 8:35 ` Ed Bartosh @ 2017-08-02 9:36 ` Ming Liu 0 siblings, 0 replies; 10+ messages in thread From: Ming Liu @ 2017-08-02 9:36 UTC (permalink / raw) To: ed.bartosh; +Cc: Ming Liu, OE-core [-- Attachment #1: Type: text/plain, Size: 1828 bytes --] Hi, Ed: OK, understood. So the intention is to let WKS_FILE_DEPENDS contain the packages needed by a specific WKS file only, while my purpose was to remove the 'do_image_wic[depends]' way of maintaining the dependencies, use WKS_FILE_DEPENDS instead. Will send a V2. //Ming Liu 2017-08-02 10:35 GMT+02:00 Ed Bartosh <ed.bartosh@linux.intel.com>: > On Tue, Aug 01, 2017 at 07:13:49PM +0200, liu.ming50@gmail.com wrote: > > From: Ming Liu <peter.x.liu@external.atlascopco.com> > > > > They are being controlled by WKS_FILE_DEPENDS_DEFAULT, the code here > > is redundant and incomplete as well. > > > > Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> > > --- > > meta/conf/machine/qemux86.conf | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86. > conf > > index c26dda2..f0bebbf 100644 > > --- a/meta/conf/machine/qemux86.conf > > +++ b/meta/conf/machine/qemux86.conf > > @@ -29,4 +29,3 @@ MACHINE_FEATURES += "x86" > > MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" > > > > WKS_FILE ?= "directdisk.wks" > > -do_image_wic[depends] += "syslinux:do_populate_sysroot > syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot > dosfstools-native:do_populate_sysroot" > > -1 > > WKS_FILE_DEPENDS_DEFAULT is a termporary setting aimed to easy > transition from using wic-tools to using WKS_FILE_DEPENDS. It contains > the whole set of packages that is not usually needed. > > Please, consider setting WKS_FILE_DEPENDS with the minimum set of packages > required by directdisk.wks. This will faster the build as unneeded > packages will not be built. > > You may want to look at "image_types_wic: set default WKS_FILE_DEPENDS" > commit for further details. > > -- > Regards, > Ed > [-- Attachment #2: Type: text/html, Size: 2738 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 4/4] qemux86-64.conf: drop do_image_wic task dependencies 2017-08-01 17:13 [PATCH 0/4] Clean up some do_image_wic redundant code liu.ming50 ` (2 preceding siblings ...) 2017-08-01 17:13 ` [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies liu.ming50 @ 2017-08-01 17:13 ` liu.ming50 3 siblings, 0 replies; 10+ messages in thread From: liu.ming50 @ 2017-08-01 17:13 UTC (permalink / raw) To: openembedded-core; +Cc: Ming Liu From: Ming Liu <peter.x.liu@external.atlascopco.com> They are being controlled by WKS_FILE_DEPENDS_DEFAULT, the code here is redundant and incomplete as well. Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com> --- meta/conf/machine/qemux86-64.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 10189cb..9f55aaa 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -30,4 +30,3 @@ MACHINE_FEATURES += "x86" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" WKS_FILE ?= "directdisk.wks" -do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- 2.7.4 ^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-08-02 9:36 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-08-01 17:13 [PATCH 0/4] Clean up some do_image_wic redundant code liu.ming50 2017-08-01 17:13 ` [PATCH 1/4] wic-image-minimal: drop WKS_FILE_DEPENDS definition liu.ming50 2017-08-02 8:38 ` Ed Bartosh 2017-08-01 17:13 ` [PATCH 2/4] image_types_wic.bbclass: deal with dependencies only with WKS_FILE_DEPENDS_DEFAULT liu.ming50 2017-08-02 8:26 ` Ed Bartosh 2017-08-02 8:56 ` Ming Liu 2017-08-01 17:13 ` [PATCH 3/4] qemux86.conf: drop do_image_wic task dependencies liu.ming50 2017-08-02 8:35 ` Ed Bartosh 2017-08-02 9:36 ` Ming Liu 2017-08-01 17:13 ` [PATCH 4/4] qemux86-64.conf: " liu.ming50
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.