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 <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9927
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
# Build updatable image. Only takes effect when sota.bbclass is inherited
DISTRO_FEATURES_append = " sota"
# 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"
# Psplash causes crash on first boot on RPi
IMAGE_FEATURES_remove = "splash"
# 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"
# Build updatable image. Only takes effect when sota.bbclass is inherited
DISTRO_FEATURES_append = " sota"
# 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"
#
# THE FUTURE is 'wic'
# IMAGE_FSTYPES_append = " wic"
#
# 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 ?= ""
IMAGE_INSTALL = "${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_ROOTFS_SIZE ?= "8192"
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}"
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_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
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");
-IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+IMAGE_FSTYPES = "${NETBOOT_FSTYPES}"
inherit core-image
IMAGE_ROOTFS_SIZE = "8192"
inherit core-image
IMAGE_ROOTFS_SIZE = "8192"