[oe-commits] org.oe.dev merge of '7ae9cf78cba04ee2ea4f44d82146b9cc9fbbd4b2'
xora commit
openembedded-commits at lists.openembedded.org
Sun Sep 30 21:19:02 UTC 2007
merge of '7ae9cf78cba04ee2ea4f44d82146b9cc9fbbd4b2'
and 'fa850c805eca306aba96aedcbfface81cfd404d8'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 27d1e2d9500a551ea792faa23f5e4f0d7c7e01b6
ViewMTN: http://monotone.openembedded.org/revision/info/27d1e2d9500a551ea792faa23f5e4f0d7c7e01b6
Files:
1
packages/procps/procps-3.2.7/linux-limits.patch
packages/procps/procps_3.2.7.bb
packages/dbus/dbus-glib
packages/dbus/dbus-glib/cross.patch
packages/dbus/dbus-glib/no-examples.patch
packages/dbus/dbus-glib/no-introspect.patch
packages/dbus/dbus-glib-0.72
packages/dbus/dbus-glib-0.72/cross.patch
packages/dbus/dbus-glib-0.72/no-introspect.patch
packages/dbus/dbus-glib-native-0.72
packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch
packages/dbus/dbus-glib-native_0.71.bb
packages/dbus/dbus-glib-native_0.72.bb
packages/dbus/dbus-glib_0.71.bb
packages/dbus/dbus-glib_0.72.bb
packages/dbus/dbus-glib-0.74
packages/dbus/dbus-glib-native-0.74
packages/dbus/dbus-glib-0.74/no-examples.patch
packages/dbus/dbus-glib-0.74/no-introspect.patch
packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch
packages/dbus/dbus-glib-native_0.74.bb
packages/dbus/dbus-glib_0.74.bb
conf/distro/angstrom-2007.1.conf
Diffs:
#
# mt diff -r7ae9cf78cba04ee2ea4f44d82146b9cc9fbbd4b2 -r27d1e2d9500a551ea792faa23f5e4f0d7c7e01b6
#
#
#
# add_file "packages/procps/procps-3.2.7/linux-limits.patch"
# content [4e5862ce2cdbc387f4c06afdbb72a6ba7bd4cf0d]
#
# patch "packages/procps/procps_3.2.7.bb"
# from [1156596e6e6d4790de434ada1775abd87157c5f6]
# to [a74fe59f24f87073234b156acea2a94721676051]
#
============================================================
--- packages/procps/procps-3.2.7/linux-limits.patch 4e5862ce2cdbc387f4c06afdbb72a6ba7bd4cf0d
+++ packages/procps/procps-3.2.7/linux-limits.patch 4e5862ce2cdbc387f4c06afdbb72a6ba7bd4cf0d
@@ -0,0 +1,13 @@
+diff --git a/pwdx.c b/pwdx.c
+index cb96a52..29ebce2 100644
+--- a/pwdx.c
++++ b/pwdx.c
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <regex.h>
+-#include <limits.h>
++#include <linux/limits.h>
+ #include <unistd.h>
+ #include <errno.h>
+
============================================================
--- packages/procps/procps_3.2.7.bb 1156596e6e6d4790de434ada1775abd87157c5f6
+++ packages/procps/procps_3.2.7.bb a74fe59f24f87073234b156acea2a94721676051
@@ -1,9 +1,10 @@ SRC_URI += "file://procmodule.patch;patc
require procps.inc
PR = "r5"
SRC_URI += "file://procmodule.patch;patch=1 \
- file://psmodule.patch;patch=1"
+ file://psmodule.patch;patch=1 \
+ file://linux-limits.patch;patch=1"
FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
#
# mt diff -rfa850c805eca306aba96aedcbfface81cfd404d8 -r27d1e2d9500a551ea792faa23f5e4f0d7c7e01b6
#
#
#
# delete "packages/dbus/dbus-glib"
#
# delete "packages/dbus/dbus-glib/cross.patch"
#
# delete "packages/dbus/dbus-glib/no-examples.patch"
#
# delete "packages/dbus/dbus-glib/no-introspect.patch"
#
# delete "packages/dbus/dbus-glib-0.72"
#
# delete "packages/dbus/dbus-glib-0.72/cross.patch"
#
# delete "packages/dbus/dbus-glib-0.72/no-introspect.patch"
#
# delete "packages/dbus/dbus-glib-native-0.72"
#
# delete "packages/dbus/dbus-glib-native-0.72/run-with-tmp-session-bus.patch"
#
# delete "packages/dbus/dbus-glib-native_0.71.bb"
#
# delete "packages/dbus/dbus-glib-native_0.72.bb"
#
# delete "packages/dbus/dbus-glib_0.71.bb"
#
# delete "packages/dbus/dbus-glib_0.72.bb"
#
# add_dir "packages/dbus/dbus-glib-0.74"
#
# add_dir "packages/dbus/dbus-glib-native-0.74"
#
# add_file "packages/dbus/dbus-glib-0.74/no-examples.patch"
# content [212f8de63efa6cfd81d365c5684896be6bd77220]
#
# add_file "packages/dbus/dbus-glib-0.74/no-introspect.patch"
# content [eb74c635af538597efb4a14a9d5617198d392a3b]
#
# add_file "packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch"
# content [80764981ad7dabe1a9e4f43dba8bc9745f95bf86]
#
# add_file "packages/dbus/dbus-glib-native_0.74.bb"
# content [d4ea0635819a397d0e6d56b2801272629daaf604]
#
# add_file "packages/dbus/dbus-glib_0.74.bb"
# content [5025a40ab2695a6e001c245f03179ad9c645c41f]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [7504c0e4038b21e36b2ea2b0841ca06e9083685d]
# to [cb21538d71e7331e7d1c8006fb53acbc216f97a3]
#
============================================================
--- packages/dbus/dbus-glib-0.74/no-examples.patch 212f8de63efa6cfd81d365c5684896be6bd77220
+++ packages/dbus/dbus-glib-0.74/no-examples.patch 212f8de63efa6cfd81d365c5684896be6bd77220
@@ -0,0 +1,8 @@
+--- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
++++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = . examples
++SUBDIRS = .
+
+ INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+
============================================================
--- packages/dbus/dbus-glib-0.74/no-introspect.patch eb74c635af538597efb4a14a9d5617198d392a3b
+++ packages/dbus/dbus-glib-0.74/no-introspect.patch eb74c635af538597efb4a14a9d5617198d392a3b
@@ -0,0 +1,14 @@
+Index: dbus-glib-0.73/tools/Makefile.am
+===================================================================
+--- dbus-glib-0.73.orig/tools/Makefile.am 2006-10-25 21:10:36.000000000 +0200
++++ dbus-glib-0.73/tools/Makefile.am 2006-10-27 10:07:35.000000000 +0200
+@@ -3,9 +3,6 @@
+ nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
+ libdbus_glibdir = $(includedir)/dbus-1.0/dbus
+
+-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
+- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
+-
+ BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
+
+ if USE_INTROSPECT_XML
============================================================
--- packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch 80764981ad7dabe1a9e4f43dba8bc9745f95bf86
+++ packages/dbus/dbus-glib-native-0.74/run-with-tmp-session-bus.patch 80764981ad7dabe1a9e4f43dba8bc9745f95bf86
@@ -0,0 +1,23 @@
+Index: dbus-glib-0.72/tools/run-with-tmp-session-bus.sh
+===================================================================
+--- dbus-glib-0.72.orig/tools/run-with-tmp-session-bus.sh 2006-09-27 14:27:25.000000000 +0200
++++ dbus-glib-0.72/tools/run-with-tmp-session-bus.sh 2006-10-27 10:13:57.000000000 +0200
+@@ -30,16 +30,15 @@
+ echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
+
+ ## create a configuration file based on the standard session.conf
+-cat $DBUS_TOP_SRCDIR/tools/session.conf | \
++cat $datadir/dbus/session.conf | \
+ sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
+ sed -e 's/<include.*$//g' \
+ > $CONFIG_FILE
+
+ echo "Created configuration file $CONFIG_FILE" >&2
+
+-export PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
+ ## the libtool script found by the path search should already do this, but
+-export LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DBUS_SESSION_BUS_PID
============================================================
--- packages/dbus/dbus-glib-native_0.74.bb d4ea0635819a397d0e6d56b2801272629daaf604
+++ packages/dbus/dbus-glib-native_0.74.bb d4ea0635819a397d0e6d56b2801272629daaf604
@@ -0,0 +1,21 @@
+SECTION = "base"
+PR = "r0"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://run-with-tmp-session-bus.patch;patch=1"
+
+inherit autotools pkgconfig gettext native
+
+S = "${WORKDIR}/dbus-glib-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-glib-${PV}"
+DEPENDS = "glib-2.0-native dbus-native"
+
+do_stage() {
+ oe_runmake install
+ install -d ${STAGING_DATADIR}/dbus
+ install -m 0644 tools/dbus-bus-introspect.xml ${STAGING_DATADIR}/dbus
+ install -m 0644 tools/dbus-glib-bindings.h ${STAGING_DATADIR}/dbus
+}
============================================================
--- packages/dbus/dbus-glib_0.74.bb 5025a40ab2695a6e001c245f03179ad9c645c41f
+++ packages/dbus/dbus-glib_0.74.bb 5025a40ab2695a6e001c245f03179ad9c645c41f
@@ -0,0 +1,28 @@
+SECTION = "base"
+PR = "r0"
+HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
+DESCRIPTION = "message bus system for applications to talk to one another"
+LICENSE = "GPL"
+DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://no-examples.patch;patch=1 \
+ file://no-introspect.patch;patch=1"
+
+inherit autotools pkgconfig gettext
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
+
+do_configure_prepend() {
+ install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-bus-introspect.xml ${S}/tools/
+ install -m 0644 ${STAGING_DIR}/${BUILD_SYS}/share/dbus/dbus-glib-bindings.h ${S}/tools/
+}
+
+do_stage () {
+ oe_libinstall -so -C dbus libdbus-glib-1 ${STAGING_LIBDIR}
+
+ autotools_stage_includes
+}
+
+FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
============================================================
--- conf/distro/angstrom-2007.1.conf 7504c0e4038b21e36b2ea2b0841ca06e9083685d
+++ conf/distro/angstrom-2007.1.conf cb21538d71e7331e7d1c8006fb53acbc216f97a3
@@ -312,7 +312,7 @@ PREFERRED_VERSION_dbus ?= "1.0.2"
PREFERRED_VERSION_busybox = "1.2.1"
PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.72"
+PREFERRED_VERSION_dbus-glib ?= "0.74"
PREFERRED_VERSION_wpa-supplicant = "0.5.5"
More information about the Openembedded-commits
mailing list