From 84a229c05b5ff760fe64f74cb3c4f71e6c5b8188 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 28 Jun 2017 15:44:34 +0200 Subject: Fix rpi-sdimg after IMAGE_FSTYPE being enforced in poky-agl.conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changeset fixes the case of the rpi-sdimg which was broken by the IMAGE_FSTYPE setting introduced in poky-agl.conf (distro-wide). A new variable AGL_EXTRA_IMAGE_FSTYPES is available now and only used in AGL (target) images. Reasoning for this solution: - any modifications to IMAGE_FSTYPES will also affect things like the initramfs or initrd images. - we minimized the disk-space requirements by reusing the ext4.xz for the rpi-sdimg Bug-AGL: SPEC-492 Change-Id: I07fd51dbcf334653cd6033b7ccb663c4d4ed8578 Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9887 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 5 +++++ meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc | 6 ++++++ meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 5 +++++ meta-agl-distro/conf/distro/poky-agl.conf | 4 ++++ meta-agl/recipes-core/images/agl-image-minimal.inc | 3 +++ meta-netboot/classes/netboot.bbclass | 4 ++-- meta-netboot/recipes-core/images/initramfs-netboot-image.bb | 2 +- 7 files changed, 26 insertions(+), 3 deletions(-) diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc index 88565fd5a..2cd9ec2a9 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc @@ -33,3 +33,8 @@ IMAGE_FEATURES_remove = "splash" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc index d6fe5facb..cfa36afed 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc @@ -29,3 +29,9 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" + +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index 88565fd5a..2cd9ec2a9 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -33,3 +33,8 @@ IMAGE_FEATURES_remove = "splash" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 2b171b238..92856fc5d 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -122,3 +122,7 @@ INITRAMFS_FSTYPES := "" # # THE FUTURE is 'wic' # IMAGE_FSTYPES_append = " wic" + +# Board templates can add extra IMAGE_FSTYPES through this. +# It is added (late) through the AGL image recipes. +AGL_EXTRA_IMAGE_FSTYPES ?= "" diff --git a/meta-agl/recipes-core/images/agl-image-minimal.inc b/meta-agl/recipes-core/images/agl-image-minimal.inc index 2f127b36f..a0818845c 100644 --- a/meta-agl/recipes-core/images/agl-image-minimal.inc +++ b/meta-agl/recipes-core/images/agl-image-minimal.inc @@ -5,3 +5,6 @@ inherit core-image IMAGE_INSTALL = "${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_ROOTFS_SIZE ?= "8192" + +# Allow extra IMAGE_FSTYPES to be added by boards configs +IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}" diff --git a/meta-netboot/classes/netboot.bbclass b/meta-netboot/classes/netboot.bbclass index 3440914a5..c74c10510 100644 --- a/meta-netboot/classes/netboot.bbclass +++ b/meta-netboot/classes/netboot.bbclass @@ -17,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.setVar("INITRAMFS_FSTYPES_pn-initramfs-netboot-image", "ext4.gz.u-boot"); + d.setVar("NETBOOT_FSTYPES", "ext4.gz.u-boot"); else: # case for new u-boot images which don't require uImage format - d.setVar("INITRAMFS_FSTYPES_pn-initramfs-netboot-image", "ext4.gz"); + d.setVar("NETBOOT_FSTYPES", "ext4.gz"); } diff --git a/meta-netboot/recipes-core/images/initramfs-netboot-image.bb b/meta-netboot/recipes-core/images/initramfs-netboot-image.bb index b9c8d2f75..cc6bc6753 100644 --- a/meta-netboot/recipes-core/images/initramfs-netboot-image.bb +++ b/meta-netboot/recipes-core/images/initramfs-netboot-image.bb @@ -11,7 +11,7 @@ IMAGE_LINGUAS = "" LICENSE = "MIT" -IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" +IMAGE_FSTYPES = "${NETBOOT_FSTYPES}" inherit core-image IMAGE_ROOTFS_SIZE = "8192" -- cgit 1.2.3-korg