summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-13 09:53:59 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-13 09:53:59 +0000
commita338a7a7fd116f4453921da421522c50643383b5 (patch)
tree4771f4e6565f340368024f615e50f0372b95641d
parentce3ef9f4e87cecbf181fb09696f39885f6087a21 (diff)
downloadpoky-a338a7a7fd116f4453921da421522c50643383b5.tar.gz
dbus: Improve fix deamon install patch to use automake magic to avoid installing wrapper scripts
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/dbus/dbus-1.2.14/fix-install-daemon.patch42
-rw-r--r--meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch42
-rw-r--r--meta/packages/dbus/dbus-native_1.2.14.bb2
-rw-r--r--meta/packages/dbus/dbus-native_1.2.4.bb2
-rw-r--r--meta/packages/dbus/dbus_1.2.14.bb2
-rw-r--r--meta/packages/dbus/dbus_1.2.4.bb2
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 @@
1Index: dbus-0.94/bus/Makefile.am 1Index: dbus-1.2.14/bus/Makefile.am
2=================================================================== 2===================================================================
3--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 3--- dbus-1.2.14.orig/bus/Makefile.am 2009-04-17 20:45:29.000000000 +0100
4+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 4+++ dbus-1.2.14/bus/Makefile.am 2009-11-13 09:47:24.000000000 +0000
5@@ -110,7 +110,7 @@ 5@@ -149,7 +149,7 @@
6 $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ 6
7 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ 7 ## we use noinst_PROGRAMS not check_PROGRAMS so that we build
8 fi 8 ## even when not doing "make check"
9-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
10+noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test dbus-daemon-launch-helper
11
12 bus_test_system_SOURCES= \
13 $(XML_SOURCES) \
14@@ -171,20 +171,17 @@
15 bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
16 bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
17
18+dbusdaemondir = $(DBUS_DAEMONDIR)
19+dbusdaemon_PROGRAMS = dbus-daemon
20+
21 ## mop up the gcov files
22 clean-local:
23 /bin/rm *.bb *.bbg *.da *.gcov || true
24
25 uninstall-hook:
26- rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
27 rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
28
29 install-data-hook:
30- if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
31- $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
32- chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
33- fi
9- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) 34- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
10+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
11 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus 35 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
12 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d 36 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
13 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services 37 $(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 @@
1Index: dbus-0.94/bus/Makefile.am 1Index: dbus-1.2.4/bus/Makefile.am
2=================================================================== 2===================================================================
3--- dbus-0.94.orig/bus/Makefile.am 2006-10-01 17:36:18.000000000 +0200 3--- dbus-1.2.4.orig/bus/Makefile.am 2008-08-07 19:44:35.000000000 +0100
4+++ dbus-0.94/bus/Makefile.am 2006-10-14 21:40:05.000000000 +0200 4+++ dbus-1.2.4/bus/Makefile.am 2009-11-13 09:45:31.000000000 +0000
5@@ -110,7 +110,7 @@ 5@@ -149,7 +149,7 @@
6 $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \ 6
7 chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \ 7 ## we use noinst_PROGRAMS not check_PROGRAMS so that we build
8 fi 8 ## even when not doing "make check"
9-noinst_PROGRAMS=$(TESTS) dbus-daemon dbus-daemon-launch-helper-test dbus-daemon-launch-helper
10+noinst_PROGRAMS=$(TESTS) dbus-daemon-launch-helper-test dbus-daemon-launch-helper
11
12 bus_test_system_SOURCES= \
13 $(XML_SOURCES) \
14@@ -171,20 +171,17 @@
15 bus_test_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_BUS_LIBS)
16 bus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
17
18+dbusdaemondir = $(DBUS_DAEMONDIR)
19+dbusdaemon_PROGRAMS = dbus-daemon
20+
21 ## mop up the gcov files
22 clean-local:
23 /bin/rm *.bb *.bbg *.da *.gcov || true
24
25 uninstall-hook:
26- rm -f $(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon
27 rm -f $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper
28
29 install-data-hook:
30- if test '!' -d $(DESTDIR)$(DBUS_DAEMONDIR); then \
31- $(mkinstalldirs) $(DESTDIR)$(DBUS_DAEMONDIR); \
32- chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
33- fi
9- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) 34- $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
10+ $(INSTALL_PROGRAM) .libs/dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
11 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus 35 $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
12 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d 36 $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
13 $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services 37 $(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
3 3
4DEPENDS = "glib-2.0-native libxml2-native expat-native" 4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5 5
6PR = "r4" 6PR = "r5"
7 7
8do_stage() { 8do_stage() {
9 oe_runmake install 9 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
3 3
4DEPENDS = "glib-2.0-native libxml2-native expat-native" 4DEPENDS = "glib-2.0-native libxml2-native expat-native"
5 5
6PR = "r4" 6PR = "r5"
7 7
8do_stage() { 8do_stage() {
9 oe_runmake install 9 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 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5inherit update-rc.d 5inherit 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 @@
1include dbus.inc 1include dbus.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5inherit update-rc.d 5inherit update-rc.d