diff options
| -rw-r--r-- | meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch | 56 | ||||
| -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.inc | 1 | ||||
| -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 edb63a5fa..000000000 --- a/meta/recipes-core/dbus/dbus-1.2.24/fix-install-daemon.patch +++ /dev/null @@ -1,56 +0,0 @@ -# Update fix-daemon-install patch to use automake magic to avoid the wrapper scripts -# -# original by RP, updated to handle dbus-daemon-launch-helper by Kevin Tian <kevin.tian@intel.com>, 2010-07-10 -Index: dbus-1.2.14/bus/Makefile.am -=================================================================== ---- 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 @@ endif - - ## 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 - - bus_test_system_SOURCES= \ - $(XML_SOURCES) \ -@@ -171,34 +171,22 @@ bus_test_SOURCES= \ - 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 -+ -+libexec_PROGRAMS = dbus-daemon-launch-helper -+ - ## 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) - $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus - $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d - $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services - $(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services - $(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1 -- $(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir) -- if test `id -u` -eq 0; then \ -- chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ -- chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \ -- else \ -- echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \ -- echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \ -- fi - - #### Init scripts fun - 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 4abc4cbf7..4abc4cbf7 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 f5c22af12..f5c22af12 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 daf5960c7..402cf1344 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" SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \ file://tmpdir.patch; \ - file://fix-install-daemon.patch; \ file://dbus-1.init" inherit 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 8e3e329fd..f331b140a 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 @@ include dbus.inc -PR = "r1" +PR = "r0" |