gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-07-07 23:34:32 +02:00
parent 3b709a3d86
commit 3917ab3104
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -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,

2
package/bzip2/bzip2.mk
View File

@ -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/