X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Fconf%2Fdistro%2Fpoky-agl.conf;h=cda899e98c8b8ee8fe5f57646a3daa522ee1cd62;hb=refs%2Ftags%2Foctopus_14.92.0;hp=3e07f0180c455534654cdf18234c541be6865095;hpb=0852bd710264329153567b9f57967f9a2f34d7ef;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 3e07f0180..cda899e98 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -6,34 +6,29 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "marlin"
+DISTRO_CODENAME = "octopus"
 AGL_BRANCH = "master"
-AGLVERSION = "12.91.0"
+AGLVERSION = "14.92.0"
+
 # switch  devel/release
 AGLRELEASETYPE ?= "agldevelopment"
-#AGLRELEASETYPE ?= "aglrelease"
+AGLRELEASETYPE := "aglrelease"
+
 OVERRIDES .= ":${AGLRELEASETYPE}"
-#
+
 
 #for development
-DISTRO_VERSION:agldevelopment := "${AGLVERSION}+snapshot-${DATE}"
-AGL_APP_REVISION:agldevelopment = "${AUTOREV}"
-AGL_DEFAULT_REVISION:agldevelopment = "${AUTOREV}"
+DISTRO_VERSION:agldevelopment := "${AGLVERSION}+snapshot-${METADATA_REVISION}"
 
 #for release
 DISTRO_VERSION:aglrelease := "${AGLVERSION}"
-DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
-AGL_APP_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-AGL_DEFAULT_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('+snapshot-${METADATA_REVISION}','')}"
 
 # reproducible builds:
-# enable the flag
-BUILD_REPRODUCIBLE_BINARIES = "1"
 # Set the desired timestamps
-export SOURCE_DATE_EPOCH = "1593400000"
-REPRODUCIBLE_TIMESTAMP_ROOTFS = "1593400000"
-# inherit the class
-INHERIT += "reproducible_build"
+# E.g. update for (major) releases
+export SOURCE_DATE_EPOCH = "1671100000"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "1671100000"
 
 
 # SDK
@@ -50,7 +45,7 @@ MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community"
 TARGET_VENDOR = "-agl"
 
 # Override these in poky based distros
-AGL_DEFAULT_DISTRO_FEATURES = "largefile opengl wayland pam bluetooth bluez5 3g polkit"
+AGL_DEFAULT_DISTRO_FEATURES = "usrmerge largefile opengl wayland pam bluetooth bluez5 3g polkit"
 POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
 OVERRIDES .= ":${DISTRO_CODENAME}"
 
@@ -111,8 +106,8 @@ SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
 
 #Redefined USER_CLASSES
 #Disable prelink. It is unmaintained and likely will go away.
-#default: USER_CLASSES ?= "buildstats image-mklibs image-prelink"
-USER_CLASSES = "buildstats image-mklibs"
+#default: USER_CLASSES ?= "buildstats image-prelink"
+USER_CLASSES = "buildstats"
 
 # AGL uses 4 optimization levels
 # 2 for ARM 32bit 
@@ -131,7 +126,7 @@ QB_MEM ?= "-m 2048"
 # use pulseaudio on the host side - off as qemu-native is built with alsa
 #QB_AUDIO_DRV = "pa"
 # expose a virtual 'hda' sound card to the guest (arm/aarch64/x86-64)
-QB_AUDIO_OPT = "-soundhw hda"
+QB_AUDIO_OPT = "-device intel-hda -device hda-duplex -audiodev alsa,id=agl"
 
 # Board templates can add extra IMAGE_FSTYPES through this.
 # It is added (late) through the AGL image recipes.