X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Fconf%2Fdistro%2Fpoky-agl.conf;h=13512a4edbc8d0a1be22584adb43c697743e7a83;hb=33ac6e22d9fc9869a8dea2dfc93797126d973ac8;hp=4947308d0b302d2c19728471f7220cb83bab5e1c;hpb=f4235a45f1c0b01208a67de94637f73b0d5ad6d4;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 4947308d0..13512a4ed 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -6,43 +6,38 @@ DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "marlin"
-AGL_BRANCH = "master"
-AGLVERSION = "12.90.1"
+DISTRO_CODENAME = "octopus"
+AGL_BRANCH = "octopus"
+AGLVERSION = "15.0.1"
+
 # switch  devel/release
-AGLRELEASETYPE ?= "agldevelopment"
-#AGLRELEASETYPE ?= "aglrelease"
+#AGLRELEASETYPE ?= "agldevelopment"
+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 = "1680600000"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "1680600000"
 
 
 # SDK
 SDK_VENDOR = "-aglsdk"
 
-# SDKPATH is the folder where the SDK is going to be installed
+# SDKPATHINSTALL is the folder where the SDK is going to be installed
 # Due to an issue with the qt5 environment (see SPEC-1667),
 # we add DEFAULTTUNE to the SDKPATH to mitigate the issue.
-SDKPATH = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
+SDKPATHINSTALL = "/opt/agl-sdk/${SDK_VERSION}-${DEFAULTTUNE}"
 
 
 MAINTAINER = "AGL https://lists.automotivelinux.org/g/agl-dev-community"
@@ -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.