dbus: Improve fix deamon install patch to use automake magic to avoid installing wrapper scripts

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

6 files changed, 70 insertions, 22 deletions

diff --git a/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch
index c31786357d..7012995fb9 100644
--- a/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch
+++ b/meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch
@@ -1,13 +1,37 @@
-Index: dbus-0.94/bus/Makefile.am
+Index: dbus-1.2.14/bus/Makefile.am
 ===================================================================
---- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
-+++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
-@@ -110,7 +110,7 @@
- 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
- 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
- 	fi
+--- dbus-1.2.14.orig/bus/Makefile.am	2009-04-17 20:45:29.000000000 +0100
++++ dbus-1.2.14/bus/Makefile.am	2009-11-13 09:47:24.000000000 +0000
+@@ -149,7 +149,7 @@
+ 
+ ## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
+ ## even when not doing "make check"
+-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
++noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test dbus-daemon-launch-helper
+ 
+ bus_test_system_SOURCES=			\
+ 	$(XML_SOURCES)				\
+@@ -171,20 +171,17 @@
+ bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
+ bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
+ 
++dbusdaemondir = $(DBUS_DAEMONDIR)
++dbusdaemon_PROGRAMS = dbus-daemon
++
+ ## mop up the gcov files
+ clean-local:
+ 	/bin/rm *.bb *.bbg *.da *.gcov || true
+ 
+ uninstall-hook:
+-	rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
+ 	rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
+ 
+ install-data-hook:
+-	if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
+-		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+-		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+-	fi
 -	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
-+	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
  	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
diff --git a/meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch
index c31786357d..2c53faf97f 100644
--- a/meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch
+++ b/meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch
@@ -1,13 +1,37 @@
-Index: dbus-0.94/bus/Makefile.am
+Index: dbus-1.2.4/bus/Makefile.am
 ===================================================================
---- dbus-0.94.orig/bus/Makefile.am	2006-10-01 17:36:18.000000000 +0200
-+++ dbus-0.94/bus/Makefile.am	2006-10-14 21:40:05.000000000 +0200
-@@ -110,7 +110,7 @@
- 		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
- 		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
- 	fi
+--- dbus-1.2.4.orig/bus/Makefile.am	2008-08-07 19:44:35.000000000 +0100
++++ dbus-1.2.4/bus/Makefile.am	2009-11-13 09:45:31.000000000 +0000
+@@ -149,7 +149,7 @@
+ 
+ ## we use noinst_PROGRAMS not check_PROGRAMS so that we build 
+ ## even when not doing "make check"
+-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
++noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test dbus-daemon-launch-helper
+ 
+ bus_test_system_SOURCES=			\
+ 	$(XML_SOURCES)				\
+@@ -171,20 +171,17 @@
+ bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
+ bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
+ 
++dbusdaemondir = $(DBUS_DAEMONDIR)
++dbusdaemon_PROGRAMS = dbus-daemon
++
+ ## mop up the gcov files
+ clean-local:
+ 	/bin/rm *.bb *.bbg *.da *.gcov || true
+ 
+ uninstall-hook:
+-	rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
+ 	rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
+ 
+ install-data-hook:
+-	if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
+-		$(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
+-		chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
+-	fi
 -	$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
-+	$(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
  	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
  	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
+ 	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
diff --git a/meta/packages/dbus/dbus-native_1.2.14.bb b/meta/packages/dbus/dbus-native_1.2.14.bb
index 425e5b2918..9e7e049e78 100644
--- a/meta/packages/dbus/dbus-native_1.2.14.bb
+++ b/meta/packages/dbus/dbus-native_1.2.14.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r4"
+PR = "r5"
 
 do_stage() {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus-native_1.2.4.bb b/meta/packages/dbus/dbus-native_1.2.4.bb
index 425e5b2918..9e7e049e78 100644
--- a/meta/packages/dbus/dbus-native_1.2.4.bb
+++ b/meta/packages/dbus/dbus-native_1.2.4.bb
@@ -3,7 +3,7 @@ inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
 
-PR = "r4"
+PR = "r5"
 
 do_stage() {
 	oe_runmake install
diff --git a/meta/packages/dbus/dbus_1.2.14.bb b/meta/packages/dbus/dbus_1.2.14.bb
index ae8772625a..3d4d00bd2f 100644
--- a/meta/packages/dbus/dbus_1.2.14.bb
+++ b/meta/packages/dbus/dbus_1.2.14.bb
@@ -1,5 +1,5 @@
 include dbus.inc
 
-PR = "r1"
+PR = "r2"
 
 inherit update-rc.d
diff --git a/meta/packages/dbus/dbus_1.2.4.bb b/meta/packages/dbus/dbus_1.2.4.bb
index ae8772625a..3d4d00bd2f 100644
--- a/meta/packages/dbus/dbus_1.2.4.bb
+++ b/meta/packages/dbus/dbus_1.2.4.bb
@@ -1,5 +1,5 @@
 include dbus.inc
 
-PR = "r1"
+PR = "r2"
 
 inherit update-rc.d