aboutsummaryrefslogtreecommitdiffstats
path: root/meta-ivi/conf/distro/poky-ivi-systemd.conf
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2016-04-15 23:20:50 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2016-04-15 23:23:44 +0900
commitace213f79d711053ad4a7f31b6f171279f244d76 (patch)
tree253e0c8fc12d570b6faf4c4fb976a9118bbd8257 /meta-ivi/conf/distro/poky-ivi-systemd.conf
parentbfd95c5021885ed61b58a33087a4ee8e3d2f32ad (diff)
parent997a4c4d8cf3f40eed0dd7fd186f18e6c88df85d (diff)
downloadmeta-ivi-ace213f79d711053ad4a7f31b6f171279f244d76.tar.gz
meta-ivi-ace213f79d711053ad4a7f31b6f171279f244d76.tar.bz2
meta-ivi-ace213f79d711053ad4a7f31b6f171279f244d76.zip
Merge branch 'origin/10.0'
Conflicts: README.md meta-ivi-bsp/recipes-graphics/mesa/mesa/README.gallium meta-ivi-bsp/recipes-graphics/mesa/mesa/revert-363b53f00069af718f64cf047f19ad5681a8bf6d.patch meta-ivi-bsp/recipes-graphics/mesa/mesa/revert-c46c551c56f78c6bf9e63524c89478695fc4f525.patch meta-ivi-bsp/recipes-graphics/mesa/mesa_10.4.%.bbappend meta-ivi-demo/conf/bblayers.conf.sample meta-ivi/conf/distro/poky-ivi-systemd.conf meta-ivi/recipes-graphics/wayland/weston_1.6.0.bbappend meta-ivi/recipes-graphics/wayland/weston_1.6.0.bbappend meta-ivi/recipes-yocto-ivi/images/leviathan-image.bb
Diffstat (limited to 'meta-ivi/conf/distro/poky-ivi-systemd.conf')
-rw-r--r--meta-ivi/conf/distro/poky-ivi-systemd.conf8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta-ivi/conf/distro/poky-ivi-systemd.conf b/meta-ivi/conf/distro/poky-ivi-systemd.conf
index 4138a95..f79f17b 100644
--- a/meta-ivi/conf/distro/poky-ivi-systemd.conf
+++ b/meta-ivi/conf/distro/poky-ivi-systemd.conf
@@ -1,7 +1,7 @@
DISTRO = "poky-ivi-systemd"
DISTRO_NAME = "Yocto GENIVI Baseline (Poky/meta-ivi)"
-DISTRO_VERSION = "9.0.1"
-DISTRO_CODENAME ="kronos"
+DISTRO_VERSION = "10.0+snapshot-${DATE}"
+DISTRO_CODENAME ="leviathan"
MAINTAINER = "meta-ivi <genivi-meta-ivi@lists.genivi.org>"
@@ -34,9 +34,6 @@ PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%"
-# to keep the compatibility of wayland-ivi-extension
-PREFERRED_VERSION_wayland-ivi-extension ?= "1.3.0"
-
POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "packagegroup-core-device-devel",d)}"
DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}"
@@ -71,7 +68,6 @@ gitsm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
-svk://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n"
MIRRORS =+ "\