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:32:50 +0000 |
| commit | 4bc052344f457bb7a1732c4d45c5eba3f4a91539 (patch) | |
| tree | ade7643d1086cfdc3cf75b402f3d24640e621e2e /meta-agl-bsp/conf/include/agl_cyclone5.inc | |
| parent | 1c46fcd4f482be6c114a815d9501adf4b7588d2c (diff) | |
Fix for image format dependencies during parsing
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/10047
Diffstat (limited to 'meta-agl-bsp/conf/include/agl_cyclone5.inc')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_cyclone5.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_cyclone5.inc b/meta-agl-bsp/conf/include/agl_cyclone5.inc index 8accf7dca..0e98d755b 100644 --- a/meta-agl-bsp/conf/include/agl_cyclone5.inc +++ b/meta-agl-bsp/conf/include/agl_cyclone5.inc @@ -3,3 +3,9 @@ OSTREE_BOOTLOADER ?= "u-boot" # DEFAULTTUNE for cortex-a9 DISTRO_FEATURES_append = " agl-medium-arm-compiler" + +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES = "socfpga-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" |