From 3470b376f2dad8325a96b5b85a8802cec716e26f Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 27 Jan 2010 02:09:03 +0100 Subject: [PATCH] dbus: fix target installation with BR2_HAVE_DEVFILES Signed-off-by: Lionel Landwerlin Signed-off-by: Peter Korsgaard --- CHANGES | 2 +- package/dbus/dbus.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 2fc503e765..207695090e 100644 --- a/CHANGES +++ b/CHANGES @@ -5,7 +5,7 @@ New packages: libcdaudio, libdvdnav, libdvdread, hostapd, tcpreplay Updated/fixed packages: at, autoconf, bash, bind, binutils, bootutils, - busybox, directfb, dnsmasq, e2fsprogs, gstreamer, gperf, + busybox, dbus, directfb, dnsmasq, e2fsprogs, gstreamer, gperf, gst-plugins-bad, gvfs, flex, hal, iptables, iw, jpeg, kismet, libfuse, libglib2, libpcap, libungif, libxml2, libxslt, lighttpd, mesa, mpg123, mtd-utils, neon, netstat-nat, openvpn, pcre, qt, readline, rpm, diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 276009c633..a97fc02bcd 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -81,7 +81,9 @@ $(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD) touch $@ $(DBUS_HOOK_POST_INSTALL): $(DBUS_TARGET_INSTALL_TARGET) +ifneq ($(BR2_HAVE_DEVFILES),y) rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 +endif rm -rf $(TARGET_DIR)/var/lib/dbus ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus $(INSTALL) -m 0755 package/dbus/S30dbus $(TARGET_DIR)/etc/init.d -- 2.30.2