X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Fconf%2Fdistro%2Fpoky-agl.conf;h=19a21ad4435748b63db9a5b22fd81e0e9ded38eb;hb=63e5c14ba2ec13f7707e48203d5f522d9fbc5616;hp=cc583fe9697d1604488a250619fc61908e00ea35;hpb=05a31cf9aa319dc952fbb76f05654b29a179eee6;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 cc583fe96..19a21ad44 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -1,48 +1,45 @@
 require conf/distro/poky.conf
 
+# Insert overrides "agldefaulttune" and "forcedefaulttune" before forcevariable
+OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}${LIBCOVERRIDE}:agldefaulttune:forcedefaulttune:forcevariable"
+
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
 
 
 # Release flags
-DISTRO_CODENAME = "lamprey"
+DISTRO_CODENAME = "ricefish"
 AGL_BRANCH = "master"
-AGLVERSION = "11.92.0"
+AGLVERSION = "17.90.0"
+
 # 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_VERSION:aglrelease := "${AGLVERSION}"
+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 = "1706800000"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "1706800000"
 
 
 # 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,11 +47,11 @@ 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}"
 
-DISTRO_FEATURES_remove = "x11"
+DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 INIT_MANAGER = "systemd"
@@ -107,18 +104,18 @@ CONNECTIVITY_CHECK_URIS ?= ""
 #BB_DANGLINGAPPENDS_WARNONLY = "1"
 
 # Not yet upstreamed; should be submitted.
-SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}"
+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 
 #   - a high and a medium setting for the CCARGS
 #   - the high setting is default (needs >= cortex-a15)
-#   - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler "
+#   - the medium setting is enabled with: DISTRO_FEATURES:append = " agl-medium-arm-compiler "
 # 1 for ARM 64bit / AARCH64
 # 1 for x86-64
 # 1 for RISC-V 64-bit
@@ -131,7 +128,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.
@@ -140,8 +137,8 @@ AGL_EXTRA_INITRAMFS_FSTYPES ??= ""
 #
 # 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_IMAGE_FSTYPES:qemuall ?= "${@bb.utils.contains('AGL_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
+AGL_DEFAULT_IMAGE_FSTYPES:append:netboot = " ${@bb.utils.contains('AGL_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
 AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 
 # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this)
@@ -149,38 +146,13 @@ AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz"
 IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
 INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}"
 #
-# THE FUTURE is 'wic'
-# IMAGE_FSTYPES_append = " wic"
-
-# Complementary package definitions for agl-test-wgt and agl-devel-wgt
-# image features
-COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test'
-COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug'
 
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
 # (revalidate after 2017-10-15, 2018-06-12: still required)
-DIRFILES_pn-nativesdk-cmake = "1"
+DIRFILES:pn-nativesdk-cmake = "1"
 
 # For https://jira.automotivelinux.org/browse/SPEC-1629 :
 # We exclude the conflicting vars from the sstate task hash.
 # This needs to be verified.
 do_package_write_rpm[vardepsexclude] += "ARCHIVER_TOPDIR PF"
 
-# Set preferred provider to new navi application
-PREFERRED_RPROVIDER_virtual/navigation ?= "ondemandnavi"
-
-# Set preferred provider for low-can device mapping configuration
-PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping"
-
-# 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
-INHERIT += "image_types_wic_workaround"