diff options
| author |   Tom Rini <trini@konsulko.com> | 2017-10-10 16:46:55 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-10-11 09:22:14 +0000 |
| commit | 8df0659bec1fa361164f6c975a385579f89aa902 (patch) | |
| tree | 7ab67f5697c470eafdb4a4cffbdc2f52d60a748c | |
| parent | 4bfc821810cdee47611c6d3e94d771971f51fa75 (diff) | |
vmdk: Update checks for 'vmdk' to include 'vmdk.xz'
Given that we now default to creating vmdk.xz rather than vmdk files we
need to ensure that when we check for 'vmdk' we also check for
'vmdk.xz'.
Bug-AGL: SPEC-775, SPEC-776
Change-Id: Ie2fba86edacade949a0c5146cd34abf4067a023b
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11215
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | meta-agl/conf/include/agl-devel.inc | 2 | ||||
| -rw-r--r-- | meta-netboot/classes/netboot.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-agl/conf/include/agl-devel.inc b/meta-agl/conf/include/agl-devel.inc index f75f4be3b..c24143593 100644 --- a/meta-agl/conf/include/agl-devel.inc +++ b/meta-agl/conf/include/agl-devel.inc @@ -4,7 +4,7 @@ IMAGE_INSTALL_append = " \ packagegroup-agl-devel \ " -IMAGE_INSTALL_append = "${@bb.utils.contains('IMAGE_FSTYPES', 'vmdk', ' open-vm-tools vboxguestdrivers', '', d)}" +IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', [ 'vmdk', 'vmdk.xz' ], ' open-vm-tools vboxguestdrivers', '', d)}" # disable install of debug files in SDK # initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs" diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass index 5d5ccbbb2..65ca4a15d 100644 --- a/meta-netboot/classes/netboot.bbclass +++ b/meta-netboot/classes/netboot.bbclass @@ -4,7 +4,7 @@ IMAGE_CLASSES += "${@'image_types_uboot' if (d.getVar("KERNEL_IMAGETYPE", True) == "uImage") else ''}" python () { - if (bb.utils.contains("IMAGE_FSTYPES","live",True,False,d) or bb.utils.contains("IMAGE_FSTYPES","vmdk",True,False,d)): + if (bb.utils.contains_any("IMAGE_FSTYPES",["live","vmdk","vmdk.xz"],True,False,d)): # typical case for Minnowboard Max d.setVar("INITRD_IMAGE","initramfs-netboot-image") d.setVar("INITRD_IMAGE_LIVE",d.getVar("INITRD_IMAGE",True)) |