first merge fixes

oe-alliance · Jul 3, 2015 · 30a969b · 30a969b
1 parent c17a4cd
commit 30a969b
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 4 deletions.
diff --git a/meta-oe/conf/distro/openatv.conf b/meta-oe/conf/distro/openatv.conf
@@ -6,7 +6,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "pulseaudio"
 
 OE_TERMINAL ?= "auto"
 DISTRO_NAME ?= "openatv"
-DISTRO_VERSION = "5.0"
+DISTRO_VERSION = "5.1"
 DISTRO_TYPE ?= "release"
 BUILD_VERSION = "0"
 

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
@@ -12,7 +12,7 @@ BBFILE_PRIORITY_oe-alliance-layer = "7"
 OE-ALLIANCE_BASE := '${@os.path.normpath("${LAYERDIR}/../")}'
 OEA-META-OE-BASE := '${@os.path.normpath("${LAYERDIR}/")}'
 
-OE_VER ?= 'OE-Alliance 3.1'
+OE_VER ?= 'OE-Alliance 3.2'
 GST_VERSION ?= "1.0"
 
 MIRRORS += "\
@@ -103,5 +103,5 @@ PREFERRED_VERSION_cifs ?= "5.9"
 PREFERRED_VERSION_samba ?= "3.6.25"
 
 PREFERRED_VERSION_python-pyopenssl ?= "0.13.1"
-PREFERRED_VERSION_wpa-supplicant ?= "2.3"
-PREFERRED_VERSION_libav ?= "9.16"
+PREFERRED_VERSION_wpa-supplicant ?= "2.4"
+PREFERRED_VERSION_libav ?= "9.18"
diff --git a/...-connectivity/bluez5/bluez5_5.30.bbappend → ...-connectivity/bluez5/bluez5_5.31.bbappend b/...-connectivity/bluez5/bluez5_5.30.bbappend → ...-connectivity/bluez5/bluez5_5.31.bbappend
diff --git a/...pa-supplicant/wpa-supplicant_2.3.bbappend → ...pa-supplicant/wpa-supplicant_2.4.bbappend b/...pa-supplicant/wpa-supplicant_2.3.bbappend → ...pa-supplicant/wpa-supplicant_2.4.bbappend
diff --git a/...ore/util-linux/util-linux_2.26.1.bbappend → ...ore/util-linux/util-linux_2.26.2.bbappend b/...ore/util-linux/util-linux_2.26.1.bbappend → ...ore/util-linux/util-linux_2.26.2.bbappend
diff --git a/...-oe/recipes-devtools/gdb/gdb_7.9.bbappend → ...e/recipes-devtools/gdb/gdb_7.9.1.bbappend b/...-oe/recipes-devtools/gdb/gdb_7.9.bbappend → ...e/recipes-devtools/gdb/gdb_7.9.1.bbappend
diff --git a/...e/recipes-devtools/git/git_2.3.7.bbappend → ...e/recipes-devtools/git/git_2.4.4.bbappend b/...e/recipes-devtools/git/git_2.3.7.bbappend → ...e/recipes-devtools/git/git_2.4.4.bbappend
diff --git a/...ultimedia/alsa/alsa-utils_1.0.28.bbappend → ...ultimedia/alsa/alsa-utils_1.0.29.bbappend b/...ultimedia/alsa/alsa-utils_1.0.28.bbappend → ...ultimedia/alsa/alsa-utils_1.0.29.bbappend
diff --git a/...ipes-multimedia/libav/libav_9.16.bbappend → ...ipes-multimedia/libav/libav_9.18.bbappend b/...ipes-multimedia/libav/libav_9.16.bbappend → ...ipes-multimedia/libav/libav_9.18.bbappend