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
Merge "Prepare 5.0.1 release" into eel
[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
22bcb4b
..
f805174
100644
(file)
--- a/
meta-agl-distro/conf/distro/poky-agl.conf
+++ b/
meta-agl-distro/conf/distro/poky-agl.conf
@@
-3,20
+3,19
@@
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.99.2+snapshot-${DATE}"
+#DISTRO_VERSION = "5.0.1+snapshot-${DATE}"
+DISTRO_VERSION = "5.0.1"
DISTRO_CODENAME = "eel"
DISTRO_CODENAME = "eel"
-DISTRO_BRANCH_VERSION_TAG
= "eel/4.99.2
"
+DISTRO_BRANCH_VERSION_TAG
:= "${DISTRO_CODENAME}/${DISTRO_VERSION}
"
SDK_VENDOR = "-aglsdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
SDK_VENDOR = "-aglsdk"
SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
-AGL_BRANCH = "
master
"
+AGL_BRANCH = "
eel
"
#for development
#AGL_APP_REVISION = "${AUTOREV}"
#for development
#AGL_APP_REVISION = "${AUTOREV}"
-#for release
-AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
-#for development
#AGL_DEFAULT_REVISION = "${AUTOREV}"
#for release
#AGL_DEFAULT_REVISION = "${AUTOREV}"
#for release
+AGL_APP_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
AGL_DEFAULT_REVISION = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
@@
-66,6
+65,7
@@
DISTRO_FEATURES_APPEND = " "
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
DISTRO_FEATURES_remove = "x11"
DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+PREFERRED_VERSION_wayland-ivi-extension ?= "1.1%"
# Prefer GStreamer 1.10.x by default
PREFERRED_VERSION_gstreamer1.0 ?= "1.10.%"
# Prefer GStreamer 1.10.x by default
PREFERRED_VERSION_gstreamer1.0 ?= "1.10.%"