From 74d0ccd5d67a88c68dd967c95d08b220ee4741b5 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/9927 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-agl-distro/conf/distro/poky-agl.conf | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-agl-distro/conf/distro') diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index f92577929..67e141ed0 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 ?= "" -- cgit 1.2.3-korg