X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Fconf%2Fdistro%2Fpoky-agl.conf;h=02f1b7e07fa267fe127c0e72579ab71a5be211fa;hb=bbed78102412173a8aac6365d9eddeac819987a6;hp=94bd4ccd5d47f48332cbaf9e5c32def5faa588ed;hpb=8543843eeb47fa9b45786d3e09bf497fcd5f95e0;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 94bd4ccd5..02f1b7e07 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -9,25 +9,24 @@ DISTRO_NAME = "Automotive Grade Linux"
 DISTRO_CODENAME = "needlefish"
 AGL_BRANCH = "master"
 AGLVERSION = "13.90.0"
+
 # switch  devel/release
 AGLRELEASETYPE ?= "agldevelopment"
-#AGLRELEASETYPE ?= "aglrelease"
+#AGLRELEASETYPE = "aglrelease"
+
 OVERRIDES .= ":${AGLRELEASETYPE}"
-#
+
 
 #for development
 DISTRO_VERSION:agldevelopment := "${AGLVERSION}+snapshot-${METADATA_REVISION}"
-AGL_APP_REVISION:agldevelopment = "${AUTOREV}"
-AGL_DEFAULT_REVISION:agldevelopment = "${AUTOREV}"
 
 #for release
 DISTRO_VERSION:aglrelease := "${AGLVERSION}"
 DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('+snapshot-${METADATA_REVISION}','')}"
-AGL_APP_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-AGL_DEFAULT_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
 # reproducible builds:
 # Set the desired timestamps
+# E.g. update for (major) releases
 export SOURCE_DATE_EPOCH = "1593400000"
 REPRODUCIBLE_TIMESTAMP_ROOTFS = "1593400000"
 
@@ -46,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}"