Merge branch 'next'

[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 8ea3ea2..639e355 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -6,9 +6,9 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "icefish"
+DISTRO_CODENAME = "jellyfish"
 AGL_BRANCH = "master"
-AGLVERSION = "8.99.4"
+AGLVERSION = "9.90.0"
 # switch  devel/release
 AGLRELEASETYPE ?= "agldevelopment"
 #AGLRELEASETYPE ?= "aglrelease"
@@ -26,6 +26,15 @@ DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('
 AGL_APP_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 AGL_DEFAULT_REVISION_aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
+# reproducible builds:
+# enable the flag
+BUILD_REPRODUCIBLE_BINARIES = "1"
+# Set the desired timestamps
+export SOURCE_DATE_EPOCH = "1583798400"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "1583798400"
+# inherit the class
+INHERIT += "reproducible_build"
+
 
 # SDK
 SDK_VENDOR = "-aglsdk"
@@ -94,10 +103,7 @@ DISTRO_FEATURES_APPEND = " "
 DISTRO_FEATURES_remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit pulseaudio"
 
-# Prefer linux-yocto 4.19 LTS version by default
-PREFERRED_VERSION_linux-yocto = "4.19%"
-
-# Prefer GStreamer 1.14.x by default
+# Prefer GStreamer 1.16.x by default
 PREFERRED_VERSION_gstreamer1.0              ?= "1.16.%"
 PREFERRED_VERSION_gstreamer1.0-plugins-bad  ?= "1.16.%"
 PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.%"
@@ -144,8 +150,10 @@ QB_AUDIO_OPT = "-soundhw hda"
 AGL_EXTRA_IMAGE_FSTYPES ??= ""
 AGL_EXTRA_INITRAMFS_FSTYPES ??= ""
 #
-# Default IMAGE FSTYPES compressed tarball + ext4.xz
-AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+# Default IMAGE FSTYPES wic.xz
+AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum"
+AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
 AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
@@ -184,6 +192,3 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping"
 # 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"
-
-# Temporarily pull in some next branch specific over-rides
-include poky-agl-next.inc