[oe-commits] org.oe.dev merge of '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'

[mickeyl commit]

merge of '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'
     and '85a1e5d843207f3fcf6f1043a822a543e89cc938'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8ca5a28e57677264b573ca113671a85d62376ebb
ViewMTN: http://monotone.openembedded.org/revision/info/8ca5a28e57677264b573ca113671a85d62376ebb
Files:
1
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
packages/cmake/cmake.inc
packages/olsr/olsrd.inc
packages/olsr/olsrd_0.4.8.bb
packages/olsr/olsrd_0.5.3.bb
Diffs:

#
# mt diff -r5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c -r8ca5a28e57677264b573ca113671a85d62376ebb
#
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [dd76fae2197a9207fa2eb5ccd100a425b415f4b4]
#    to [96e99822b9d459465b271b5dfd924834b9d2cbfc]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	dd76fae2197a9207fa2eb5ccd100a425b415f4b4
+++ conf/distro/include/preferred-om-2008-versions.inc	96e99822b9d459465b271b5dfd924834b9d2cbfc
@@ -1369,8 +1369,8 @@ PREFERRED_VERSION_openvpn ?= "2.0.9"
 PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.4.0.1"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
-PREFERRED_VERSION_opkg-native ?= "4488"
-PREFERRED_VERSION_opkg ?= "4488"
+SRCREV_pn-opkg-native ?= "4488"
+SRCREV_pn-opkg ?= "4488"
 PREFERRED_VERSION_oplinux-packages ?= "1.0"
 PREFERRED_VERSION_oprofile ?= "0.9.3"
 PREFERRED_VERSION_orage ?= "4.4.1"
@@ -1530,8 +1530,8 @@ PREFERRED_VERSION_python-pygnome ?= "2.1
 PREFERRED_VERSION_python-pyflakes ?= "0.2.1"
 PREFERRED_VERSION_python-pygame ?= "1.7.1"
 PREFERRED_VERSION_python-pygnome ?= "2.16.2"
-PREFERRED_VERSION_python-pygobject ?= "2.12.3"
-PREFERRED_VERSION_python-pygobject-native ?= "2.12.3"
+PREFERRED_VERSION_python-pygobject ?= "2.14.2"
+PREFERRED_VERSION_python-pygobject-native ?= "2.14.2"
 PREFERRED_VERSION_python-pygoogle ?= "0.6"
 PREFERRED_VERSION_python-pygtk-1.2 ?= "0.6.12"
 PREFERRED_VERSION_python-pygtk ?= "2.10.4"


#
# mt diff -r85a1e5d843207f3fcf6f1043a822a543e89cc938 -r8ca5a28e57677264b573ca113671a85d62376ebb
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [3d76b802ee411de675a661b6622637dacf88c43e]
#    to [d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341]
# 
# patch "packages/cmake/cmake.inc"
#  from [342c5f01763ec602a7231d9b7a69e285c0684c55]
#    to [66a198fe039d2d1080772aaa30ea89bae7541dc3]
# 
# patch "packages/olsr/olsrd.inc"
#  from [8f56b9aa91c3eb5463c0db445070be3b92c2f6e9]
#    to [78cbd7651bec0ee6e127917dad1568ddb2753ee0]
# 
# patch "packages/olsr/olsrd_0.4.8.bb"
#  from [73e860138fd6fb1fba782fdb10cfb2cf696ae0e0]
#    to [f9258d022ca6619c0fe253150728113226aa2c15]
# 
# patch "packages/olsr/olsrd_0.5.3.bb"
#  from [203f63fd7ae86bd25144c1ddac0872e5117eea3f]
#    to [f8e759edd3dec4ca996ca63d822d1e729d4153c0]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	3d76b802ee411de675a661b6622637dacf88c43e
+++ conf/distro/include/sane-srcrevs.inc	d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341
@@ -38,6 +38,7 @@ SRCREV_pn-ffmpeg ?= "12186"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-ffmpeg ?= "12186"
+SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
============================================================
--- packages/cmake/cmake.inc	342c5f01763ec602a7231d9b7a69e285c0684c55
+++ packages/cmake/cmake.inc	66a198fe039d2d1080772aaa30ea89bae7541dc3
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.cmake.org/"
 
 DESCRIPTION = "A cross-platform, open-source make system"
 HOMEPAGE = "http://www.cmake.org/"
-LICENSE = "Berkely-style license"
+LICENSE = "Berkeley-style license"
 SECTION = "console/utils"
 
 CMAKE_MAJOR_VERSION = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
============================================================
--- packages/olsr/olsrd.inc	8f56b9aa91c3eb5463c0db445070be3b92c2f6e9
+++ packages/olsr/olsrd.inc	78cbd7651bec0ee6e127917dad1568ddb2753ee0
@@ -5,7 +5,8 @@ LICENSE = "BSD"
 PRIORITY = "optional"
 LICENSE = "BSD"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
 	file://init \
 	file://olsrd.conf"
 
============================================================
--- packages/olsr/olsrd_0.4.8.bb	73e860138fd6fb1fba782fdb10cfb2cf696ae0e0
+++ packages/olsr/olsrd_0.4.8.bb	f9258d022ca6619c0fe253150728113226aa2c15
@@ -5,7 +5,8 @@ LICENSE = "BSD"
 PRIORITY = "optional"
 LICENSE = "BSD"
 
-SRC_URI="http://www.olsr.org/releases/0.4/olsrd-${PV}.tar.bz2 \
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
 	file://init \
 	file://olsrd.conf"
 
============================================================
--- packages/olsr/olsrd_0.5.3.bb	203f63fd7ae86bd25144c1ddac0872e5117eea3f
+++ packages/olsr/olsrd_0.5.3.bb	f8e759edd3dec4ca996ca63d822d1e729d4153c0
@@ -1,7 +1,8 @@ require olsrd.inc
 require olsrd.inc
+
 PR = "r0"
 
-SRC_URI="http://www.olsr.org/releases/0.5/olsrd-${PV}.tar.bz2 \
+SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
         file://init \
         file://olsrd.conf \
         file://unbreak-makefile.patch;patch=1"