diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-16 13:25:32 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-09-16 13:36:00 +0200 |
| commit | 1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75 (patch) | |
| tree | b3b4fb6139799602676e100126c19055b18ac7f0 /package/dbus | |
| parent | c106fdbd100f36fe3329360af8f656566937f00a (diff) | |
| parent | ae2be8dbc36293d8243baf2b13ad17a47738d6d3 (diff) | |
| download | buildroot-novena-1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75.tar.gz buildroot-novena-1860bdae8cdf4f9eb7097fd7e5ed7e9c0c5b6a75.zip | |
Merge branch 'for-2010.11/remove-oldstyle-hooks' of git://git.busybox.net/~tpetazzoni/git/buildroot
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/dbus')
| -rw-r--r-- | package/dbus/dbus.mk | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index e93738e35..141cf69ff 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -49,6 +49,29 @@ else DBUS_CONF_OPT += --without-x endif +# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink) +define DBUS_REMOVE_VAR_LIB_DBUS + rm -rf $(TARGET_DIR)/var/lib/dbus +endef + +DBUS_POST_BUILD_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS + +define DBUS_REMOVE_DEVFILES + rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 +endef + +ifneq ($(BR2_HAVE_DEVFILES),y) +DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES +endif + +define DBUS_INSTALL_TARGET_FIXUP + 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 +endef + +DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP + HOST_DBUS_DEPENDENCIES = host-pkg-config host-expat HOST_DBUS_CONF_OPT = \ --with-dbus-user=dbus \ @@ -73,17 +96,3 @@ HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT $(eval $(call AUTOTARGETS,package,dbus)) $(eval $(call AUTOTARGETS,package,dbus,host)) - -# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink) -$(DBUS_HOOK_POST_BUILD): $(DBUS_TARGET_BUILD) - rm -rf $(TARGET_DIR)/var/lib/dbus - 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 - touch $@ |