summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-07-05 17:21:03 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-07-05 17:15:29 +0000
commit0c484021acec08398da9781beb94d90bf2e8caaf (patch)
tree03ab3e66f7412ebf48052a3441bc27043a26c7b2 /meta-agl-bsp
parent04001fcf1ac53d9a590fa4b8ac3167a36157b8c4 (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-bsp')
-rw-r--r--meta-agl-bsp/conf/include/agl_beaglebone.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_cyclone5.inc6
-rw-r--r--meta-agl-bsp/conf/include/agl_intel-corei7-64.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_joule.inc4
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi2.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc2
-rw-r--r--meta-agl-bsp/conf/include/agl_raspberrypi3.inc2
7 files changed, 19 insertions, 3 deletions
diff --git a/meta-agl-bsp/conf/include/agl_beaglebone.inc b/meta-agl-bsp/conf/include/agl_beaglebone.inc
index be9785a5a..970e8111e 100644
--- a/meta-agl-bsp/conf/include/agl_beaglebone.inc
+++ b/meta-agl-bsp/conf/include/agl_beaglebone.inc
@@ -40,3 +40,5 @@ SECURITY_LDFLAGS_pn-gpm = ""
SECURITY_CFLAGS_pn-libatasmart = ""
SECURITY_LDFLAGS_pn-libatasmart = ""
+
+AGL_EXTRA_IMAGE_FSTYPES := "wic.xz" \ No newline at end of file
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"
diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index c31ac2759..47d5a5f45 100644
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -23,3 +23,7 @@ IMAGE_INSTALL_append = " \
libva \
va-intel \
gstreamer-vaapi-1.0 "
+
+AGL_DEFAULT_IMAGE_FSTYPES := "live wic"
+AGL_DEFAULT_INITRAMFS_FSTYPES := "cpio.gz"
+NOISO = "1"
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"
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
index 2cd9ec2a9..5de54be63 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
@@ -34,7 +34,7 @@ IMAGE_FEATURES_remove = "splash"
DISTRO_FEATURES_append = " sota"
# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz"
+AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz"
# Use the AGL default ext4.xz to generate the rpi-sdimg
SDIMG_ROOTFS_TYPE = "ext4.xz"
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
index cfa36afed..6f42c3602 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc
@@ -31,7 +31,7 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware "
IMAGE_FEATURES_remove = "splash"
# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz"
+AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz"
# Use the AGL default ext4.xz to generate the rpi-sdimg
SDIMG_ROOTFS_TYPE = "ext4.xz"
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 2cd9ec2a9..5de54be63 100644
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -34,7 +34,7 @@ IMAGE_FEATURES_remove = "splash"
DISTRO_FEATURES_append = " sota"
# Add the custom rpi-sdimg output format
-AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz"
+AGL_EXTRA_IMAGE_FSTYPES = " rpi-sdimg.xz"
# Use the AGL default ext4.xz to generate the rpi-sdimg
SDIMG_ROOTFS_TYPE = "ext4.xz"