wok-stable rev 1620
slitaz-loram*: do not assume files are in /usr/bin
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Oct 21 08:48:46 2008 +0000 (2008-10-21) |
parents | 6f21be70783b |
children | 4316a95d4b4e |
files | slitaz-loram-cdrom/stuff/loram.extract slitaz-loram-cdrom/stuff/loram.rootfs slitaz-loram-http/stuff/loram.extract slitaz-loram-http/stuff/loram.rootfs slitaz-loram/stuff/loram.extract slitaz-loram/stuff/loram.rootfs |
line diff
1.1 --- a/slitaz-loram-cdrom/stuff/loram.extract Mon Oct 20 21:19:09 2008 +0000 1.2 +++ b/slitaz-loram-cdrom/stuff/loram.extract Tue Oct 21 08:48:46 2008 +0000 1.3 @@ -1,6 +1,5 @@ 1.4 # remove link to cdrom 1.5 [ -d cdrom ] && rmdir cdrom 1.6 -rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free 1.7 if [ -L usr ]; then 1.8 rm usr 1.9 cp -a $1/usr . 1.10 @@ -44,3 +43,6 @@ 1.11 sed -i 's/CLEAN_UP_SYSTEM="no"/CLEAN_UP_SYSTEM="yes"/' etc/rcS.conf 1.12 sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf 1.13 fi 1.14 +for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do 1.15 + [ -e usr/$ii ] && rm -f $ii 1.16 +done
2.1 --- a/slitaz-loram-cdrom/stuff/loram.rootfs Mon Oct 20 21:19:09 2008 +0000 2.2 +++ b/slitaz-loram-cdrom/stuff/loram.rootfs Tue Oct 21 08:48:46 2008 +0000 2.3 @@ -90,7 +90,7 @@ 2.4 EOT 2.5 fi 2.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do 2.7 - ln -s busybox $ii 2.8 + [ -e $ii ] || ln -s busybox $ii 2.9 done 2.10 mkdir cdrom 2.11 COMPRESSION="gzip"
3.1 --- a/slitaz-loram-http/stuff/loram.extract Mon Oct 20 21:19:09 2008 +0000 3.2 +++ b/slitaz-loram-http/stuff/loram.extract Tue Oct 21 08:48:46 2008 +0000 3.3 @@ -1,6 +1,5 @@ 3.4 # remove link to cdrom 3.5 [ -d cdrom ] && rmdir cdrom 3.6 -rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free 3.7 if [ -L usr ]; then 3.8 rm usr 3.9 cp -a $1/usr . 3.10 @@ -44,3 +43,6 @@ 3.11 sed -i 's/CLEAN_UP_SYSTEM="no"/CLEAN_UP_SYSTEM="yes"/' etc/rcS.conf 3.12 sed -i 's/RUN_DAEMONS="/RUN_DAEMONS="slim /' etc/rcS.conf 3.13 fi 3.14 +for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do 3.15 + [ -e usr/$ii ] && rm -f $ii 3.16 +done
4.1 --- a/slitaz-loram-http/stuff/loram.rootfs Mon Oct 20 21:19:09 2008 +0000 4.2 +++ b/slitaz-loram-http/stuff/loram.rootfs Tue Oct 21 08:48:46 2008 +0000 4.3 @@ -34,7 +34,7 @@ 4.4 mv default.script usr/share/udhcpc 4.5 ln -s /cdrom/boot boot 4.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free; do 4.7 - ln -s busybox $ii 4.8 + [ -e $ii ] || ln -s busybox $ii 4.9 done 4.10 mkdir cdrom .usr.rw 4.11 COMPRESSION="gzip"
5.1 --- a/slitaz-loram/stuff/loram.extract Mon Oct 20 21:19:09 2008 +0000 5.2 +++ b/slitaz-loram/stuff/loram.extract Tue Oct 21 08:48:46 2008 +0000 5.3 @@ -1,5 +1,4 @@ 5.4 rmdir usr 5.5 -rm -f bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink 5.6 packedfs=".usr.cromfs" 5.7 if [ -f $packedfs ]; then 5.8 bin/unmkcromfs $packedfs usr 5.9 @@ -20,3 +19,6 @@ 5.10 for ii in lib/libz.so lib/libstdc++.so lib/libgcc_s.so; do 5.11 [ -e $ii ] && mv $ii* usr/lib/ 5.12 done 5.13 +for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink; do 5.14 + [ -e usr/$ii ] && rm -f $ii 5.15 +done
6.1 --- a/slitaz-loram/stuff/loram.rootfs Mon Oct 20 21:19:09 2008 +0000 6.2 +++ b/slitaz-loram/stuff/loram.rootfs Tue Oct 21 08:48:46 2008 +0000 6.3 @@ -37,5 +37,5 @@ 6.4 COMPRESSION="none" 6.5 echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression" 6.6 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink; do 6.7 - ln -s busybox $ii 6.8 + [ -e $ii ] || ln -s busybox $ii 6.9 done