summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-11-17 12:35:26 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:26 -0800
commit9c0cecbf6a8aa0ec8c6719618a9c9857637f29cb (patch)
tree79d5d1061a28f4e143f95d39cc209a36f60d3c29
parentaaa29fff393dc7ed460713ef45b9654b1d2c623e (diff)
downloadpoky-9c0cecbf6a8aa0ec8c6719618a9c9857637f29cb.tar.gz
dbus: upgrade to version 1.4.0
from 1.2.24 - fix-install-daemon is removed since two binaries can be handled correctly by Makefile Signed-off-by: Qing He <qing.he@intel.com>
-rw-r--r--meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch56
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.0/dbus-1.init (renamed from meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init)0
-rw-r--r--meta/recipes-core/dbus/dbus-1.4.0/tmpdir.patch (renamed from meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch)0
-rw-r--r--meta/recipes-core/dbus/dbus.inc1
-rw-r--r--meta/recipes-core/dbus/dbus_1.4.0.bb (renamed from meta/recipes-core/dbus/dbus_1.2.24.bb)2
5 files changed, 1 insertions, 58 deletions
diff --git a/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch b/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
deleted file mode 100644
index edb63a5faf..0000000000
--- a/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1# Update fix-daemon-install patch to use automake magic to avoid the wrapper scripts
2#
3# original by RP, updated to handle dbus-daemon-launch-helper by Kevin Tian <kevin.tian@intel.com>, 2010-07-10
4Index: dbus-1.2.14/bus/Makefile.am
5===================================================================
6--- dbus-1.2.14.orig/bus/Makefile.am 2009-04-17 20:45:29.000000000 +0100
7+++ dbus-1.2.14/bus/Makefile.am 2009-11-13 09:47:24.000000000 +0000
8@@ -149,7 +149,7 @@ endif
9
10 ## we use noinst_PROGRAMS not check_PROGRAMS so that we build
11 ## even when not doing "make check"
12-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
13+noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test
14
15 bus_test_system_SOURCES= \
16 $(XML_SOURCES) \
17@@ -171,34 +171,22 @@ bus_test_SOURCES= \
18 bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
19 bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
20
21+dbusdaemondir = $(DBUS_DAEMONDIR)
22+dbusdaemon_PROGRAMS = dbus-daemon
23+
24+libexec_PROGRAMS = dbus-daemon-launch-helper
25+
26 ## mop up the gcov files
27 clean-local:
28 /bin/rm *.bb *.bbg *.da *.gcov || true
29
30-uninstall-hook:
31- rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
32- rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
33-
34 install-data-hook:
35- if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
36- $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
37- chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
38- fi
39- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
40 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
41 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
42 $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
43 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
44 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
45 $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
46- $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
47- if test `id -u` -eq 0; then \
48- chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
49- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
50- else \
51- echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \
52- echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \
53- fi
54
55 #### Init scripts fun
56 SCRIPT_IN_FILES=messagebus.in \
diff --git a/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init b/meta/recipes-core/dbus/dbus-1.4.0/dbus-1.init
index 4abc4cbf73..4abc4cbf73 100644
--- a/meta/recipes-core/dbus/dbus-1.2.24/dbus-1.init
+++ b/meta/recipes-core/dbus/dbus-1.4.0/dbus-1.init
diff --git a/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch b/meta/recipes-core/dbus/dbus-1.4.0/tmpdir.patch
index f5c22af129..f5c22af129 100644
--- a/meta/recipes-core/dbus/dbus-1.2.24/tmpdir.patch
+++ b/meta/recipes-core/dbus/dbus-1.4.0/tmpdir.patch
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index daf5960c70..402cf13442 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -9,7 +9,6 @@ DEPENDS = "expat glib-2.0 virtual/libintl virtual/libx11 libsm"
9 9
10SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ 10SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
11 file://tmpdir.patch; \ 11 file://tmpdir.patch; \
12 file://fix-install-daemon.patch; \
13 file://dbus-1.init" 12 file://dbus-1.init"
14 13
15inherit autotools pkgconfig gettext update-rc.d 14inherit autotools pkgconfig gettext update-rc.d
diff --git a/meta/recipes-core/dbus/dbus_1.2.24.bb b/meta/recipes-core/dbus/dbus_1.4.0.bb
index 8e3e329fde..f331b140aa 100644
--- a/meta/recipes-core/dbus/dbus_1.2.24.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.0.bb
@@ -1,3 +1,3 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r1" 3PR = "r0"