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 "Fix m4-native build with recent glibc versions" into guppy
[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
745e724
..
a63c19f
100644
(file)
--- a/
meta-agl-distro/conf/distro/poky-agl.conf
+++ b/
meta-agl-distro/conf/distro/poky-agl.conf
@@
-7,11
+7,11
@@
DISTRO_NAME = "Automotive Grade Linux"
# Release flags
DISTRO_CODENAME = "guppy"
# Release flags
DISTRO_CODENAME = "guppy"
-AGL_BRANCH = "
master
"
-AGLVERSION = "
6.99
.2"
+AGL_BRANCH = "
guppy
"
+AGLVERSION = "
7.0
.2"
# switch devel/release
# switch devel/release
-
#
AGLRELEASETYPE ?= "agldevelopment"
-AGLRELEASETYPE ?= "aglrelease"
+AGLRELEASETYPE ?= "agldevelopment"
+
#
AGLRELEASETYPE ?= "aglrelease"
OVERRIDES .= ":${AGLRELEASETYPE}"
#
OVERRIDES .= ":${AGLRELEASETYPE}"
#
@@
-42,7
+42,7
@@
MAINTAINER = "AGL <automotive-discussions@lists.linuxfoundation.org>"
TARGET_VENDOR = "-agl"
# Override these in poky based distros
TARGET_VENDOR = "-agl"
# Override these in poky based distros
-AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5"
+AGL_DEFAULT_DISTRO_FEATURES = "largefile systemd opengl wayland pam bluetooth bluez5
3g
"
POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
OVERRIDES .= ":${DISTRO_CODENAME}"
POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}"
OVERRIDES .= ":${DISTRO_CODENAME}"