summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2010-01-27 01:09:03 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-01-28 21:54:44 (GMT)
commit3470b376f2dad8325a96b5b85a8802cec716e26f (patch)
tree1e6d2d41561ce8863d366a1628fcbd1b428ef589
parentb732fe6db6919183c07618b02981873ba5c22da8 (diff)
downloadbuildroot-3470b376f2dad8325a96b5b85a8802cec716e26f.tar.gz
buildroot-3470b376f2dad8325a96b5b85a8802cec716e26f.tar.bz2
dbus: fix target installation with BR2_HAVE_DEVFILES
Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES2
-rw-r--r--package/dbus/dbus.mk2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 2fc503e..2076950 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 276009c..a97fc02 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