wok-next diff busybox/receipt @ rev 5974
mirror-tools: fix FSH
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Mon Aug 09 09:37:59 2010 +0200 (2010-08-09) |
parents | 51ee2dc8ea91 |
children | 75dd5efa3105 |
line diff
1.1 --- a/busybox/receipt Wed Jul 28 11:56:35 2010 +0200 1.2 +++ b/busybox/receipt Mon Aug 09 09:37:59 2010 +0200 1.3 @@ -33,7 +33,7 @@ 1.4 cp ../stuff/$PACKAGE-$VERSION.config .config 1.5 make oldconfig 1.6 if [ "$(gcc --version | awk '{ print $3; exit }')" == "4.5.0" ]; then 1.7 - # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crach) 1.8 + # "CFLAGS=-O0" is a workaround for GCC 4.5.0 (sed crash) 1.9 # "CFLAGS=-fno-tree-pta" may be a workaround for GCC 4.5.0 (sed garbage) 1.10 make -j 4 "CFLAGS=-O0" && make "CFLAGS=-O0" install 1.11 else 1.12 @@ -85,7 +85,7 @@ 1.13 tazpkg get-install glibc-base --forced 1.14 fi 1.15 answer="" 1.16 - while read i ; do 1.17 + for i in $(cat $1$INSTALLED/$PACKAGE/files.list); do 1.18 [ -f $1$i ] || continue 1.19 case "$i" in 1.20 /bin/busybox) continue ;; 1.21 @@ -101,12 +101,13 @@ 1.22 esac 1.23 fi 1.24 cp -a $1$i $1$i-busybox-install 1.25 - done < $1$INSTALLED/$PACKAGE/files.list 1.26 + done 1.27 } 1.28 1.29 post_install() 1.30 { 1.31 local i 1.32 + [ -f /etc/resolv.conf-busybox-install ] && 1.33 mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf 1.34 while read i ; do 1.35 [ -f $1$i-busybox-install ] || continue