From be141be78efd87a910f03b83f7f89e5b2690d17f Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 26 Jun 2017 22:50:53 +0200 Subject: Enforce same IMAGE_FSTYPES across all boards for AGL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changeset enforces the same output images across all boards to be ext4.xz and tar.xz . No exceptions. Reasons: disk space, unification of instructions, download size Bug-AGL: SPEC-492 Change-Id: I41c92ba1d92a6e5854cea470eea6e0b559945d5d Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9813 Reviewed-by: Kevin Hilman Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-netboot/classes/netboot.bbclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'meta-netboot') diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass index 753ef79e3..3440914a5 100644 --- a/meta-netboot/classes/netboot.bbclass +++ b/meta-netboot/classes/netboot.bbclass @@ -4,8 +4,6 @@ IMAGE_CLASSES += "${@'image_types_uboot' if (d.getVar("KERNEL_IMAGETYPE", True) == "uImage") else ''}" python () { - d.appendVar("IMAGE_FSTYPES"," ext4") - if (bb.utils.contains("IMAGE_FSTYPES","live",True,False,d)): # typical case for Minnowboard Max d.setVar("INITRD_IMAGE","initramfs-netboot-image") @@ -19,9 +17,9 @@ python () { d.setVar("INITRAMFS_IMAGE","initramfs-netboot-image") if (d.getVar("KERNEL_IMAGETYPE",True) == "uImage"): # case for "old" u-boot images, like Porter board - d.appendVar("INITRAMFS_FSTYPES"," ext4.gz.u-boot"); + d.setVar("INITRAMFS_FSTYPES_pn-initramfs-netboot-image", "ext4.gz.u-boot"); else: # case for new u-boot images which don't require uImage format - d.appendVar("INITRAMFS_FSTYPES"," ext4.gz"); + d.setVar("INITRAMFS_FSTYPES_pn-initramfs-netboot-image", "ext4.gz"); } -- cgit 1.2.3-korg