From 4bc052344f457bb7a1732c4d45c5eba3f4a91539 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Wed, 5 Jul 2017 17:21:03 +0200 Subject: Fix for image format dependencies during parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit local.conf is evaluated first before the distro configuration. This caused issues while parsing the IMAGE_FSTYPES. The same set of IMAGE_FSTYPES did not throw the same switches deep in the other recipes. We define AGL_EXTRA_IMAGE_FSTYPES and AGL_EXTRA_INITRAMFS_FSTYPES for use in conf/local.conf or the device templates which are added early on-top of the defaults: AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ext4.xz" (tar.xz for direct use, ext4.xz for direct use and CI) AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz" (format for initramfs/initrd with smack labels) Both sets can be overridden in the device configuration / template. Device templates have been adapted accordingly. Bug-AGL: SPEC-492 Change-Id: I962ee8cc461b307b494d13ce3a3ebca154bebc86 Signed-off-by: Jan-Simon Möller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10047 --- meta-agl-bsp/conf/include/agl_joule.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-agl-bsp/conf/include/agl_joule.inc') diff --git a/meta-agl-bsp/conf/include/agl_joule.inc b/meta-agl-bsp/conf/include/agl_joule.inc index 212cb15af..014ce436a 100644 --- a/meta-agl-bsp/conf/include/agl_joule.inc +++ b/meta-agl-bsp/conf/include/agl_joule.inc @@ -9,3 +9,7 @@ IMAGE_INSTALL_append = " \ va-intel \ gstreamer-vaapi-1.0 " OSTREE_BOOTLOADER ?= "u-boot" + +AGL_DEFAULT_IMAGE_FSTYPES := "live wic" +AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz" +NOISO = "1" -- cgit 1.2.3-korg