From 3917ab310490cb50cdb87c95e2461747069aa8a6 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 7 Jul 2010 23:34:32 +0200 Subject: bzip2: don't overwrite busybox during installation The bzip2 make install target follows symlinks, so if busybox is enabled and the bzip/bunzip2 applets are installed, bin/busybox will get overwritten by bzip2. Fix it by ensuring any previously installed bzip2/bunzip2/bzcat (the applets available in busybox) are removed before running make install. Signed-off-by: Peter Korsgaard --- package/bzip2/bzip2.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'package/bzip2') diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk index 39e183205..3f341ee7a 100644 --- a/package/bzip2/bzip2.mk +++ b/package/bzip2/bzip2.mk @@ -49,7 +49,9 @@ define BZIP2_INSTALL_STAGING_CMDS ) endef +# make sure busybox doesn't get overwritten by make install define BZIP2_INSTALL_TARGET_CMDS + rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat) $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/ -- cgit v1.2.3