tazwok rev 324
Automated merge with http://repos.slitaz.org/tazwok-experimental
author | Antoine Bodin <gokhlayeh@slitaz.org> |
---|---|
date | Sun Feb 20 02:53:02 2011 +0100 (2011-02-20) |
parents | 54b83bde92a2 32b8fbc44418 |
children | 9b4d31fbaa11 |
files |
line diff
1.1 --- a/chroot-scripts/cook-toolchain Sat Feb 19 00:53:25 2011 +0000 1.2 +++ b/chroot-scripts/cook-toolchain Sun Feb 20 02:53:02 2011 +0100 1.3 @@ -106,7 +106,6 @@ 1.4 # Ajout manuel de libtaz et tazwok dans ce chroot. 1.5 cp -a /etc/slitaz/tazpkg.conf /tmp/tazpkg.conf 1.6 mkdir -p /tmp/backup/var/lib/tazpkg 1.7 -cp -a /var/lib/tazpkg/* /tmp/backup/var/lib/tazpkg 1.8 sed 's/^AUTO_INSTALL_DEPS="yes"/AUTO_INSTALL_DEPS="no"/' -i \ 1.9 /etc/slitaz/tazpkg.conf 1.10 BASE_PKGS="tazpkg tazwok-experimental slitaz-base-files libtaz" 1.11 @@ -117,17 +116,15 @@ 1.12 if [ -d /var/log/slitaz ]; then 1.13 cp -a /var/log/slitaz/* /tmp/backup/var/log/slitaz 1.14 fi 1.15 +cp -a /var/lib/tazpkg/* /tmp/backup/var/lib/tazpkg 1.16 cp -a /etc/slitaz/* /tmp/backup/etc/slitaz 1.17 cp -a /tmp/tazpkg.conf /tmp/backup/etc/slitaz 1.18 cp -a /etc/resolv.conf /tmp/backup/etc 1.19 -# make sure that if /bin/sh link is not delete we use bash in tools for sh 1.20 -# otherwise you may get sigment fail 1.21 -mkdir -p /tmp/backup/bin 1.22 -ln -s /tools/bin/bash /tmp/backup/bin/sh 1.23 1.24 +# Switch to temp toolchain tools entirely. 1.25 rm -r /bin /etc /lib /sbin /usr /var 1.26 cp -a /tmp/backup/* / 1.27 -#rm -r /tmp/backup 1.28 +rm -r /tmp/backup 1.29 1.30 case $ARCH in 1.31 x86_64) ln -sv lib /lib64 && ln -sv lib /usr/lib64 ;; 1.32 @@ -146,6 +143,7 @@ 1.33 1.34 ln -s /tools/bin/perl /usr/bin 1.35 ln -s /tools/bin/gettext.sh /usr/bin 1.36 +ln -s /tools/bin/busybox /bin/sh 1.37 1.38 report end-step 1.39