summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--package/bzip2/bzip2.mk2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 02edf36e3..70ec74993 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,8 +15,8 @@
luafilesystem, luasocket, rings, wsapi, xavante, xterm
Updated/fixed packages: berkeleydb, bash, blackbox, busybox,
- cdrkit, dash, dialog, diffutils, distcc, dmalloc, dnsmasq,
- dropbear, fbv, file, gawk, gstreamer, gzip, intltool,
+ bzip2, cdrkit, dash, dialog, diffutils, distcc, dmalloc,
+ dnsmasq, dropbear, fbv, file, gawk, gstreamer, gzip, intltool,
ipsec-tools, iptables, libart, libfuse, libgpg-error, libidn,
liblockfile, links, lmbench, lrzsz, make, module-init-tools,
nbd, ncurses, netperf, ntfsprogs, openssl, php, qt, quagga,
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/