dmraid: remove useless strip and use correct step override method

For the target installation step, do not rely on the package being
installed in the staging directory, as it may not be true. So the
dmraid binary is directly taken from the build directory.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-09-01 23:18:30 +02:00
parent 4dfe998b32
commit 020e028108

View File

@ -12,23 +12,13 @@ DMRAID_MAKE = $(MAKE1)
DMRAID_DEPENDENCIES:=lvm2 DMRAID_DEPENDENCIES:=lvm2
DMRAID_INSTALL_STAGING:=yes DMRAID_INSTALL_STAGING:=yes
$(eval $(call AUTOTARGETS,package,dmraid)) define DMRAID_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 $(@D)/$(DMRAID_SUBDIR)/tools/dmraid $(TARGET_DIR)/usr/sbin
$(DMRAID_TARGET_INSTALL_TARGET): $(DMRAID_TARGET_INSTALL_STAGING)
$(call MESSAGE,"Installing to target")
$(INSTALL) -m 0755 $(STAGING_DIR)/usr/sbin/dmraid $(TARGET_DIR)/usr/sbin
$(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/dmraid $(INSTALL) -m 0755 package/dmraid/dmraid.init $(TARGET_DIR)/etc/init.d/dmraid
touch $@ endef
ifeq ($(BR2_ENABLE_DEBUG),) define DMRAID_UNINSTALL_TARGET_CMDS
$(DMRAID_HOOK_POST_INSTALL): $(DMRAID_TARGET_INSTALL_TARGET)
$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/dmraid
touch $@
endif
$(DMRAID_TARGET_UNINSTALL):
$(call MESSAGE,"Uninstalling")
# makefile has no uninstall target..
# $(MAKE) DESTDIR=$(STAGING_DIR) -C $(DMRAID_DIR) uninstall
rm -f $(TARGET_DIR)/usr/sbin/dmraid $(TARGET_DIR)/etc/init.d/dmraid rm -f $(TARGET_DIR)/usr/sbin/dmraid $(TARGET_DIR)/etc/init.d/dmraid
rm -f $(DMRAID_TARGET_INSTALL_TARGET) $(DMRAID_HOOK_POST_INSTALL) endef
$(eval $(call AUTOTARGETS,package,dmraid))