Code Review
/
AGL
/
meta-agl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Mask conflicting variables from package_write_rpm hash
[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
e60002e
..
4d78c6c
100644
(file)
--- a/
meta-agl-distro/conf/distro/poky-agl.conf
+++ b/
meta-agl-distro/conf/distro/poky-agl.conf
@@
-3,8
+3,8
@@
require conf/distro/poky.conf
# AGL specific derivations
DISTRO = "poky-agl"
DISTRO_NAME = "Automotive Grade Linux"
# AGL specific derivations
DISTRO = "poky-agl"
DISTRO_NAME = "Automotive Grade Linux"
-
#
DISTRO_VERSION = "5.99.2+snapshot-${DATE}"
-DISTRO_VERSION := "5.99.2"
+DISTRO_VERSION = "5.99.2+snapshot-${DATE}"
+
#
DISTRO_VERSION := "5.99.2"
DISTRO_CODENAME = "flounder"
DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
SDK_VENDOR = "-aglsdk"
DISTRO_CODENAME = "flounder"
DISTRO_BRANCH_VERSION_TAG := "flounder/${@'${DISTRO_VERSION}'.replace('+snapshot-${DATE}','')}"
SDK_VENDOR = "-aglsdk"
@@
-13,11
+13,11
@@
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
AGL_BRANCH = "master"
#for development
AGL_BRANCH = "master"
#for development
-
#
AGL_APP_REVISION = "${AUTOREV}"
-
#
AGL_DEFAULT_REVISION = "${AUTOREV}"
+AGL_APP_REVISION = "${AUTOREV}"
+AGL_DEFAULT_REVISION = "${AUTOREV}"
#for release
#for release
-AGL_APP_REVISION := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-AGL_DEFAULT_REVISION := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+
#
AGL_APP_REVISION := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
+
#
AGL_DEFAULT_REVISION := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
@@
-157,3
+157,8
@@
PACKAGE_FEED_ARCHS = ""
# 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"
# 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"
+
+# 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"