diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2010-12-23 20:24:51 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2010-12-23 20:24:51 +0100 |
commit | 6661f4da6e46dcb9b2c95dd6914cc06218a4a8bc (patch) | |
tree | c04600464e8a70a7b2b0188ae74195f78fee4af5 /recipes-core | |
parent | 7eb7dce48ba082c30f1fceced04c275420158b9a (diff) | |
download | meta-openembedded-6661f4da6e46dcb9b2c95dd6914cc06218a4a8bc.tar.gz |
dbus-glib: drop from layer and the one in yocto core
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-core')
-rw-r--r-- | recipes-core/dbus/dbus-glib-0.86/no-examples.patch | 8 | ||||
-rw-r--r-- | recipes-core/dbus/dbus-glib-0.86/no-introspect.patch | 12 | ||||
-rw-r--r-- | recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch | 24 | ||||
-rw-r--r-- | recipes-core/dbus/dbus-glib.inc | 53 | ||||
-rw-r--r-- | recipes-core/dbus/dbus-glib_0.86.bb | 14 |
5 files changed, 0 insertions, 111 deletions
diff --git a/recipes-core/dbus/dbus-glib-0.86/no-examples.patch b/recipes-core/dbus/dbus-glib-0.86/no-examples.patch deleted file mode 100644 index 483153db7..000000000 --- a/recipes-core/dbus/dbus-glib-0.86/no-examples.patch +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | --- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200 | ||
2 | +++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200 | ||
3 | @@ -1,4 +1,4 @@ | ||
4 | -SUBDIRS = . examples | ||
5 | +SUBDIRS = . | ||
6 | |||
7 | INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" | ||
8 | |||
diff --git a/recipes-core/dbus/dbus-glib-0.86/no-introspect.patch b/recipes-core/dbus/dbus-glib-0.86/no-introspect.patch deleted file mode 100644 index 84c22fb8c..000000000 --- a/recipes-core/dbus/dbus-glib-0.86/no-introspect.patch +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | --- /tmp/Makefile.am 2010-03-28 12:24:13.000000000 +0200 | ||
2 | +++ dbus-glib-0.86/tools/Makefile.am 2010-03-28 12:24:30.000000000 +0200 | ||
3 | @@ -3,9 +3,6 @@ | ||
4 | nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h | ||
5 | libdbus_glibdir = $(includedir)/dbus-1.0/dbus | ||
6 | |||
7 | -dbus-glib-bindings.h: $(top_srcdir)/dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) | ||
8 | - $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h $(top_srcdir)/dbus-bus-introspect.xml | ||
9 | - | ||
10 | BUILT_SOURCES = dbus-glib-bindings.h | ||
11 | |||
12 | EXTRA_DIST = run-with-tmp-session-bus.sh session.conf | ||
diff --git a/recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch b/recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch deleted file mode 100644 index a04f404f7..000000000 --- a/recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh | ||
2 | =================================================================== | ||
3 | --- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100 | ||
4 | +++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100 | ||
5 | @@ -30,17 +30,15 @@ | ||
6 | echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2 | ||
7 | |||
8 | ## create a configuration file based on the standard session.conf | ||
9 | -cat $DBUS_TOP_SRCDIR/tools/session.conf | \ | ||
10 | +cat $datadir/tools/session.conf | \ | ||
11 | sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \ | ||
12 | sed -e 's/<include.*$//g' \ | ||
13 | > $CONFIG_FILE | ||
14 | |||
15 | echo "Created configuration file $CONFIG_FILE" >&2 | ||
16 | |||
17 | -PATH=$DBUS_TOP_BUILDDIR/bus:$PATH | ||
18 | -export PATH | ||
19 | ## the libtool script found by the path search should already do this, but | ||
20 | -LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH | ||
21 | +LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH | ||
22 | export PATH | ||
23 | unset DBUS_SESSION_BUS_ADDRESS | ||
24 | unset DBUS_SESSION_BUS_PID | ||
diff --git a/recipes-core/dbus/dbus-glib.inc b/recipes-core/dbus/dbus-glib.inc deleted file mode 100644 index c1c1813d9..000000000 --- a/recipes-core/dbus/dbus-glib.inc +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | DESCRIPTION = "GLib bindings for the dbus message bus system" | ||
2 | HOMEPAGE = "http://www.freedesktop.org/Software/dbus" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "GPLv2+ AFLv2.1" | ||
5 | |||
6 | DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus" | ||
7 | DEPENDS_virtclass-native = "expat-native glib-2.0-native dbus-native" | ||
8 | |||
9 | INC_PR = "r2" | ||
10 | |||
11 | |||
12 | SRC_URI = "\ | ||
13 | http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ | ||
14 | file://no-examples.patch \ | ||
15 | file://no-introspect.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI_virtclass-native = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz" | ||
19 | |||
20 | inherit autotools pkgconfig gettext | ||
21 | |||
22 | BBCLASSEXTEND = "native" | ||
23 | |||
24 | do_configure_prepend() { | ||
25 | install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ | ||
26 | install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ | ||
27 | |||
28 | } | ||
29 | |||
30 | do_configure_virtclass-native() { | ||
31 | autotools_do_configure | ||
32 | } | ||
33 | |||
34 | do_install_virtclass-native() { | ||
35 | autotools_do_install | ||
36 | install -d ${D}${datadir}/dbus | ||
37 | install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus | ||
38 | } | ||
39 | |||
40 | PACKAGES += "${PN}-bash-completion" | ||
41 | |||
42 | FILES_${PN}-bash-completion = "\ | ||
43 | ${sysconfdir}/bash_completion.d \ | ||
44 | ${prefix}/libexec/dbus-bash-completion-helper \ | ||
45 | " | ||
46 | |||
47 | FILES_${PN} = "${libdir}/lib*.so.*" | ||
48 | |||
49 | FILES_${PN}-dev += "\ | ||
50 | ${libdir}/dbus-1.0/include \ | ||
51 | ${bindir}/dbus-glib-tool \ | ||
52 | ${bindir}/dbus-binding-tool \ | ||
53 | " | ||
diff --git a/recipes-core/dbus/dbus-glib_0.86.bb b/recipes-core/dbus/dbus-glib_0.86.bb deleted file mode 100644 index ce87d5d43..000000000 --- a/recipes-core/dbus/dbus-glib_0.86.bb +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | require dbus-glib.inc | ||
2 | |||
3 | PR = "${INC_PR}.1" | ||
4 | |||
5 | SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch" | ||
6 | |||
7 | do_install_virtclass-native_prepend() { | ||
8 | install -d ${D}${datadir}/dbus | ||
9 | install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus | ||
10 | } | ||
11 | |||
12 | SRC_URI[md5sum] = "cd0ab148fb0c786fc88be49d19971f50" | ||
13 | SRC_URI[sha256sum] = "5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc" | ||
14 | |||