diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-07-05 17:21:03 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-07-05 17:15:29 +0000 |
| commit | 0c484021acec08398da9781beb94d90bf2e8caaf (patch) | |
| tree | 03ab3e66f7412ebf48052a3441bc27043a26c7b2 /meta-agl-distro/conf/distro | |
| parent | 04001fcf1ac53d9a590fa4b8ac3167a36157b8c4 (diff) | |
Fix for image format dependencies during parsingdab_3.99.2dab/3.99.23.99.2
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 <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10049
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Dominig ar Foll <dominig.arfoll@fridu.net>
Diffstat (limited to 'meta-agl-distro/conf/distro')
| -rw-r--r-- | meta-agl-distro/conf/distro/poky-agl.conf | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index 67e141ed0..1e4d2c296 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -114,15 +114,19 @@ require conf/distro/include/${TARGET_ARCH}-tune.inc QB_MEM ?= "-m 1024" -# DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) +# Board templates can add extra IMAGE_FSTYPES through this. +# It is added (late) through the AGL image recipes. +AGL_EXTRA_IMAGE_FSTYPES ??= "" +AGL_EXTRA_INITRAMFS_FSTYPES ??= "" # -IMAGE_FSTYPES := "tar.xz ext4.xz" -INITRAMFS_FSTYPES := "" +# Default IMAGE FSTYPES compressed tarball + ext4.xz +AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ext4.xz" +AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz" +# DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) +# +IMAGE_FSTYPES := "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}" +INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_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 ?= "" |