X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-distro%2Fconf%2Fdistro%2Fpoky-agl.conf;h=9684a9740b580f3189b23aa099b05444cf193409;hb=refs%2Fchanges%2F99%2F11199%2F2;hp=4931f96a89aeb65f7a776d02ec7c8be77cc79418;hpb=cb0b5d9dc435fe4d4eb89629a9a93311bed841bd;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 4931f96a8..9684a9740 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -3,9 +3,9 @@ require conf/distro/poky.conf
 # AGL specific derivations
 DISTRO = "poky-agl"
 DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "4.90.0+snapshot-${DATE}"
+DISTRO_VERSION = "4.99.1+snapshot-${DATE}"
 DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.90.0"
+DISTRO_BRANCH_VERSION_TAG = "eel/4.99.1"
 SDK_VENDOR = "-aglsdk"
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
@@ -133,3 +133,8 @@ INITRAMFS_FSTYPES := "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FST
 #
 # THE FUTURE is 'wic'
 # IMAGE_FSTYPES_append = " wic"
+
+
+# Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools
+# (revalidate after 2017-10-15)
+DIRFILES_pn-nativesdk-cmake = "1"