Prepare Jumping Jellyfish 10.0.3 release

[AGL/meta-agl.git] / meta-agl-distro / conf / distro / poky-agl.conf

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 030b002..a94aaab 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -7,11 +7,11 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 # Release flags
 DISTRO_CODENAME = "jellyfish"
-AGL_BRANCH = "master"
-AGLVERSION = "9.99.2"
+AGL_BRANCH = "jellyfish"
+AGLVERSION = "10.0.3"
 # switch  devel/release
-AGLRELEASETYPE ?= "agldevelopment"
-#AGLRELEASETYPE ?= "aglrelease"
+#AGLRELEASETYPE ?= "agldevelopment"
+AGLRELEASETYPE ?= "aglrelease"
 OVERRIDES .= ":${AGLRELEASETYPE}"
 #
 
@@ -189,10 +189,19 @@ do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"
 PREFERRED_RPROVIDER_virtual/navigation ?= "ondemandnavi"
 
 # Set preferred provider for low-can device mapping configuration
-PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping"
+PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'dev-mapping-ci', 'dev-mapping', d)}"
 
 # Mask upstream meta-security bbappend that interferes with non-linux-yocto
 # kernels due to the bug of having two wildcards, which bitbake does not
 # support. Not having it is not an issue, since there is also explicit
 # enabling of required security features done by meta-agl/meta-security.
 BBMASK += "meta-security/recipes-kernel/linux/linux-%_5.%.bbappend"
+
+# Workaround for https://jira.automotivelinux.org/browse/SPEC-3621
+# TLDR: do_image_wic will modify the target's /etc/fstab while
+# do_image_tar and do_image_ext4 can run in parallel
+# This needs to be fixed upstream:
+# See https://bugzilla.yoctoproject.org/show_bug.cgi?id=13994
+# For convenience restricted to ext4 and tar image types.
+AGL_FORBID_FSTAB_UPDATE ?= "${@bb.utils.contains_any('IMAGE_FSTYPES', 'ext4 ext4.xz tar tar.gz tar.bz2 tar.xz', '--no-fstab-update', '', d)}"
+WIC_CREATE_EXTRA_ARGS_append = " ${AGL_FORBID_FSTAB_UPDATE}"