Commit 3917ab31 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 3b709a3d

CHANGES

+2 −2
Original line number Diff line number Diff line
@@ -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,

package/bzip2/bzip2.mk

+2 −0
Original line number Diff line number Diff line
@@ -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/