diff options
Diffstat (limited to 'meta/packages/dbus/dbus-1.2.24/fix-install-daemon.patch')
-rw-r--r-- | meta/packages/dbus/dbus-1.2.24/fix-install-daemon.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/packages/dbus/dbus-1.2.24/fix-install-daemon.patch b/meta/packages/dbus/dbus-1.2.24/fix-install-daemon.patch new file mode 100644 index 0000000000..edb63a5faf --- /dev/null +++ b/meta/packages/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 | ||
4 | Index: 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 \ | ||