Post rc1 bump of poky-agl.conf

[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 065baf2..9e29763 100644 (file)
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,10 +3,10 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "5.90.0+snapshot-${DATE}"
-#DISTRO_VERSION = "5.90.0"
+DISTRO_VERSION = "5.99.1+snapshot-${DATE}"
+#DISTRO_VERSION := "5.99.1"
 DISTRO_CODENAME = "flounder"
-DISTRO_BRANCH_VERSION_TAG = "flounder/5.90.0"
+DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
@@ -155,5 +155,5 @@ PACKAGE_FEED_ARCHS = ""
 
 
 # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
-# (revalidate after 2017-10-15)
-#DIRFILES_pn-nativesdk-cmake = "1"
+# (revalidate after 2017-10-15, 2018-06-12: still required)
+DIRFILES_pn-nativesdk-cmake = "1"