From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: Patrick Ohly <patrick.ohly@intel.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 6/8] image_types_wic: set default WKS_FILE_DEPENDS
Date: Fri, 14 Jul 2017 12:01:20 +0300 [thread overview]
Message-ID: <20170714090120.GA15794@linux.intel.com> (raw)
In-Reply-To: <1499761760.20211.97.camel@intel.com>
On Tue, Jul 11, 2017 at 10:29:20AM +0200, Patrick Ohly wrote:
> On Thu, 2017-07-06 at 10:56 +0300, Ed Bartosh wrote:
> > diff --git a/meta/classes/image_types_wic.bbclass
> > b/meta/classes/image_types_wic.bbclass
> > index 05ee68d..e9750b5 100644
> > --- a/meta/classes/image_types_wic.bbclass
> > +++ b/meta/classes/image_types_wic.bbclass
> > @@ -40,7 +40,10 @@ USING_WIC =
> > "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s
> > 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 ??= ''
> > +WKS_FILE_DEPENDS ??= 'syslinux-native bmap-tools-native
> > cdrtools-native btrfs-tools-native squashfs-tools-native'
> > +WKS_FILE_DEPENDS_append_x86 = " syslinux grub-efi systemd-boot"
> > +WKS_FILE_DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot"
> > +
>
> Using _append here adds these additional dependencies even when
> WKS_FILE_DEPENDS has been set explicitly. How about this:
True. Sorry, overlooked this.
> WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native
> cdrtools-native btrfs-tools-native squashfs-tools-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"
>
> WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}"
>
Thanks, will do it in v2.
--
Regards,
Ed
next prev parent reply other threads:[~2017-07-14 9:13 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-06 7:56 [PATCH 0/8] #11552 - wic: avoid unnecessary dependencies Ed Bartosh
2017-07-06 7:56 ` [PATCH 1/8] wic: get rid of using wic-tools Ed Bartosh
2017-07-06 7:56 ` [PATCH 2/8] wic: isoimage: do not remove temp directory Ed Bartosh
2017-07-06 7:56 ` [PATCH 3/8] wic: build wic-tools only if wic is run manually Ed Bartosh
2017-07-06 7:56 ` [PATCH 4/8] wic: isoimage-isohybrid: check result of glob() Ed Bartosh
2017-07-06 7:56 ` [PATCH 5/8] wic-tools: don't create wic-tools.env Ed Bartosh
2017-07-06 7:56 ` [PATCH 6/8] image_types_wic: set default WKS_FILE_DEPENDS Ed Bartosh
2017-07-11 8:29 ` Patrick Ohly
2017-07-14 9:01 ` Ed Bartosh [this message]
2017-07-06 7:56 ` [PATCH 7/8] wic: isoimage-isohybrid: use grub-efi from deploy dir Ed Bartosh
2017-07-06 7:56 ` [PATCH 8/8] selftest: fixed 3 wic test cases Ed Bartosh
2017-07-06 8:31 ` ✗ patchtest: failure for #11552 - wic: avoid unnecessary dependencies Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170714090120.GA15794@linux.intel.com \
--to=ed.bartosh@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=patrick.ohly@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox