[oe-commits] org.oe.dev merge of 'a061abf4bdeedaccdb10ef3b7372827d261db509'

pb commit oe at amethyst.openembedded.net
Mon Sep 1 17:46:34 UTC 2008


merge of 'a061abf4bdeedaccdb10ef3b7372827d261db509'
     and 'c6e91bf295f3be4e74e18520fdbb8aeb20908d3e'

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 66bd492adca87ff47c943a434969c9f89f8a070d
ViewMTN: http://monotone.openembedded.org/revision/info/66bd492adca87ff47c943a434969c9f89f8a070d
Files:
1
packages/python/python-dbus_0.82.4.bb
packages/python/python-dbus_0.83.0.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/freesmartphone/frameworkd_git.bb
packages/python/python-evas_cvs.bb
packages/bash/bash_3.2.bb
packages/mesa/mesa-dri_6.5.2.bb
packages/mesa/mesa-dri_7.0.3.bb
Diffs:

#
# mt diff -ra061abf4bdeedaccdb10ef3b7372827d261db509 -r66bd492adca87ff47c943a434969c9f89f8a070d
#
#
#
# delete "packages/python/python-dbus_0.82.4.bb"
# 
# add_file "packages/python/python-dbus_0.83.0.bb"
#  content [d9b17dfc709c12f2ab61951f4956a5f072587a6e]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [de9d4b591e5fc2aee97cb683cb4c06bd3b30b405]
#    to [679c230eb147ac091e5d246a98381ec1ec18d7d5]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [a88563d4a70d9669a0ca31aad5bd7a0321820d99]
#    to [ce937c1ef7f7922020eaaabc3f9b59a6444b1544]
# 
# patch "packages/python/python-evas_cvs.bb"
#  from [e10e5677f94c661d96f2145c6bf743dc44f4d217]
#    to [004f170367e06ca113e955f686f51ce112ce9368]
#
============================================================
--- packages/python/python-dbus_0.83.0.bb	d9b17dfc709c12f2ab61951f4956a5f072587a6e
+++ packages/python/python-dbus_0.83.0.bb	d9b17dfc709c12f2ab61951f4956a5f072587a6e
@@ -0,0 +1,21 @@
+DESCRIPTION = "Python bindings for DBus, a socket-based message bus system for interprocess communication"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+LICENSE = "MIT"
+DEPENDS = "expat dbus dbus-glib virtual/libintl python-pyrex-native"
+RDEPENDS = "python-io python-logging python-stringold python-threading python-xml"
+PR = "ml0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${PV}.tar.gz"
+S = "${WORKDIR}/dbus-python-${PV}"
+
+inherit distutils-base autotools pkgconfig
+
+export BUILD_SYS := "${BUILD_SYS}"
+export HOST_SYS := "${HOST_SYS}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN}-dev += "${libdir}/pkgconfig 
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	de9d4b591e5fc2aee97cb683cb4c06bd3b30b405
+++ conf/distro/include/preferred-om-2008-versions.inc	679c230eb147ac091e5d246a98381ec1ec18d7d5
@@ -1506,7 +1506,7 @@ PREFERRED_VERSION_python-constraint ?= "
 PREFERRED_VERSION_python ?= "2.5.2"
 PREFERRED_VERSION_python-ao ?= "0.82"
 PREFERRED_VERSION_python-constraint ?= "1.1"
-PREFERRED_VERSION_python-dbus ?= "0.82.4"
+PREFERRED_VERSION_python-dbus ?= "0.83.0"
 PREFERRED_VERSION_python-fam ?= "1.1.1"
 PREFERRED_VERSION_python-fnorb ?= "1.3"
 PREFERRED_VERSION_python-fpconst ?= "0.6.0"
============================================================
--- packages/freesmartphone/frameworkd_git.bb	a88563d4a70d9669a0ca31aad5bd7a0321820d99
+++ packages/freesmartphone/frameworkd_git.bb	ce937c1ef7f7922020eaaabc3f9b59a6444b1544
@@ -5,7 +5,7 @@ PV = "0.8.2+gitr${SRCREV}"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.2+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 inherit distutils update-rc.d
 
@@ -31,6 +31,7 @@ RDEPENDS_${PN} += "\
   python-pyserial \
   python-pyyaml \
   python-shell \
+  python-subprocess \
   python-syslog \
   \
   ${PN}-config \
============================================================
--- packages/python/python-evas_cvs.bb	e10e5677f94c661d96f2145c6bf743dc44f4d217
+++ packages/python/python-evas_cvs.bb	004f170367e06ca113e955f686f51ce112ce9368
@@ -3,10 +3,6 @@ PR = "r0"
 PV = "0.2.1+cvs${SRCDATE}"
 PR = "r0"
 
-do_compile_prepend() {
-	touch include/evas/__init__.py
-}
-
 do_stage() {
 	distutils_stage_all
 }


#
# mt diff -rc6e91bf295f3be4e74e18520fdbb8aeb20908d3e -r66bd492adca87ff47c943a434969c9f89f8a070d
#
#
#
# patch "packages/bash/bash_3.2.bb"
#  from [efdb38a0bc9dd6aa39807b4101582e878d9bd101]
#    to [93daac9fcebd3af194bbe1c71f6d8d352d3033fd]
# 
# patch "packages/mesa/mesa-dri_6.5.2.bb"
#  from [9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8]
#    to [dabfbdb8220ef89ec8eca714b0541407e7ae9aee]
# 
# patch "packages/mesa/mesa-dri_7.0.3.bb"
#  from [5d4a0c4a70a84c4f229000a50d59787d2df46405]
#    to [86c06dffe4ef94442dc544fdbb1160f05a97daf0]
#
============================================================
--- packages/bash/bash_3.2.bb	efdb38a0bc9dd6aa39807b4101582e878d9bd101
+++ packages/bash/bash_3.2.bb	93daac9fcebd3af194bbe1c71f6d8d352d3033fd
@@ -1,6 +1,6 @@ require bash.inc
 require bash.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "\
            file://builtins.patch;patch=1 \
@@ -37,4 +37,10 @@ SRC_URI += "\
            http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031;patch=1;pnum=0 \
            http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032;patch=1;pnum=0 \
            http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038;patch=1;pnum=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039;patch=1;pnum=0 \
            "
============================================================
--- packages/mesa/mesa-dri_6.5.2.bb	9ad52ef52dce72a10eeb8817bc6da38ccd9f3ec8
+++ packages/mesa/mesa-dri_6.5.2.bb	dabfbdb8220ef89ec8eca714b0541407e7ae9aee
@@ -6,7 +6,7 @@ PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
@@ -36,6 +36,6 @@ python populate_packages_prepend () {
 python populate_packages_prepend () {
         import re, os.path
 
-        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver')
+        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver', extra_depends='')
 }
 
============================================================
--- packages/mesa/mesa-dri_7.0.3.bb	5d4a0c4a70a84c4f229000a50d59787d2df46405
+++ packages/mesa/mesa-dri_7.0.3.bb	86c06dffe4ef94442dc544fdbb1160f05a97daf0
@@ -7,7 +7,7 @@ PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
 PACKAGES_DYNAMIC = "mesa-dri-driver-*"
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS += "libdrm"
 # DRI is useless without the kernel drivers
@@ -37,6 +37,6 @@ python populate_packages_prepend () {
 python populate_packages_prepend () {
         import re, os.path
 
-        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver')
+        do_split_packages(d, root=bb.data.expand('${libdir}/dri', d), file_regex='(.*)_dri\.so', output_pattern='mesa-dri-driver-%s', description='%s DRI driver', extra_depends='')
 }
 






More information about the Openembedded-commits mailing list