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
Change DISTRO_VERSION for EE rc1
[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
4931f96
..
9684a97
100644
(file)
--- 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"
# AGL specific derivations
DISTRO = "poky-agl"
DISTRO_NAME = "Automotive Grade Linux"
-DISTRO_VERSION = "4.9
0.0
+snapshot-${DATE}"
+DISTRO_VERSION = "4.9
9.1
+snapshot-${DATE}"
DISTRO_CODENAME = "eel"
DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG = "eel/4.9
0.0
"
+DISTRO_BRANCH_VERSION_TAG = "eel/4.9
9.1
"
SDK_VENDOR = "-aglsdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
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"
#
# 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"