diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-06-26 22:50:53 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-06-28 00:37:34 +0000 |
| commit | be141be78efd87a910f03b83f7f89e5b2690d17f (patch) | |
| tree | 7d84de936ca28aab6a15e88def5b19babd353aa0 | |
| parent | 31deb5337dcfcc37e19a13c949cc2e355a81bd85 (diff) | |
Enforce same IMAGE_FSTYPES across all boards for AGL
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 <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9813
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
| -rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 9 | ||||
| -rw-r--r-- | meta-netboot/classes/netboot.bbclass | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 70dcb3f80..2b171b238 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -113,3 +113,12 @@ require conf/distro/include/${TARGET_ARCH}-tune.inc # - use 1G RAM by default QB_MEM ?= "-m 1024" + +# DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) +# +IMAGE_FSTYPES := "tar.xz ext4.xz" +INITRAMFS_FSTYPES := "" + +# +# THE FUTURE is 'wic' +# IMAGE_FSTYPES_append = " wic" 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"); } |