diff options
| author | Kevin Tian <kevin.tian@intel.com> | 2010-07-10 17:22:04 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-13 15:21:45 +0100 |
| commit | 67eeb71308e8307a99d12417dfb0fe8f016814da (patch) | |
| tree | 1706a99abdce003edd62a683392b6661003777f5 /meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch | |
| parent | 85d83ab01bcb1ca9d5ba940ee84fa503f207a480 (diff) | |
| download | poky-67eeb71308e8307a99d12417dfb0fe8f016814da.tar.gz | |
dbus: upgrade to 1.2.24
[Patches]
REMOVE _cross.patch_: fixed in upstream
KEEP _tmpdir.patch_: disable tmpdir test in build system
UPDATE _fix-install-daemon.patch_: use automake for binary install instead of manual
tweaks. extend it to cover dbus-daemon-launch-helper
[Recipe]
- remove native recipes and old versions
- install to STAGING_DATADIR_NATIVE directly
- remove manual tweak on dbus-daemon-launch-helper install
- remove stale config options
- adjust indention
- enable dbus in runlevel 3 since networkmanager has requirement at that level
- remove preferred versions in poky-fixed-revisions.inc. Based on discussion with Josh,
the preferred version is there just because dbus is not carefully tested before
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch')
| -rw-r--r-- | meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch | 37 |
1 files changed, 0 insertions, 37 deletions
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 deleted file mode 100644 index 2c53faf97f..0000000000 --- a/meta/packages/dbus/dbus-1.2.4/fix-install-daemon.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | Index: dbus-1.2.4/bus/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- dbus-1.2.4.orig/bus/Makefile.am 2008-08-07 19:44:35.000000000 +0100 | ||
| 4 | +++ dbus-1.2.4/bus/Makefile.am 2009-11-13 09:45:31.000000000 +0000 | ||
| 5 | @@ -149,7 +149,7 @@ | ||
| 6 | |||
| 7 | ## we use noinst_PROGRAMS not check_PROGRAMS so that we build | ||
| 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 | ||
| 34 | - $(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR) | ||
| 35 | $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus | ||
| 36 | $(mkinstalldirs) $(DESTDIR)$(configdir)/system.d | ||
| 37 | $(mkinstalldirs) $(DESTDIR)$(configdir)/session.d | ||