summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch')
-rw-r--r--meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch56
1 files changed, 56 insertions, 0 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
new file mode 100644
index 0000000000..edb63a5faf
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch
@@ -0,0 +1,56 @@
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 \