wok-next rev 19029
syslinux/taziso: fix inst*2zip
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Apr 05 09:37:40 2016 +0200 (2016-04-05) |
parents | bb2e9d803029 |
children | 9382538ce463 |
files | beautifulsoup/receipt syslinux/stuff/iso2exe/taziso |
line diff
1.1 --- a/beautifulsoup/receipt Sun Apr 03 13:42:07 2016 +0200 1.2 +++ b/beautifulsoup/receipt Tue Apr 05 09:37:40 2016 +0200 1.3 @@ -10,6 +10,7 @@ 1.4 TARBALL="$SOURCE-$VERSION.tar.gz" 1.5 WEB_SITE="http://www.crummy.com/software/BeautifulSoup/" 1.6 WGET_URL="${WEB_SITE}bs4/download/${VERSION%.*}/$TARBALL" 1.7 +PROVIDES="python-beautifulsoup" 1.8 TAGS="parser XML HTML" 1.9 1.10 DEPENDS="python"
2.1 --- a/syslinux/stuff/iso2exe/taziso Sun Apr 03 13:42:07 2016 +0200 2.2 +++ b/syslinux/stuff/iso2exe/taziso Tue Apr 05 09:37:40 2016 +0200 2.3 @@ -198,7 +198,9 @@ 2.4 unset useposixovl 2.5 blkid | grep $(df $mnt | sed '$!d;s/ .*/:/') | \ 2.6 grep -qiE "(msdos|vfat|ntfs)" && useposixovl=YES 2.7 - 2.8 + case "$mnt" in 2.9 + *mkzip*) useposixovl=YES 2.10 + esac 2.11 mkdir -p $mnt/slitaz/boot $mnt/slitaz/mnt/dos 2.12 [ "$useposixovl" ] && 2.13 if ! mount.posixovl -F $mnt/slitaz -- \ 2.14 @@ -407,7 +409,7 @@ 2.15 device= 2.16 packages_list= 2.17 packages_dir= 2.18 - mnt=/tmp/mnt$$ 2.19 + mnt=/tmp/mkzipmnt$$ 2.20 mkdir -p $mnt 2.21 $1 $2 || return 2.22 for i in bootlace.com grubinst.exe grldr ; do 2.23 @@ -464,7 +466,7 @@ 2.24 zip -zr9 $(basename "$ISO" .iso).zip slitaz ) 2.25 [ "$(which advzip)" ] && advzip -z4 $mnt/*.zip 2.26 mv $mnt/*.zip . 2.27 - ls -l $PWD/$(basename "$ISO" .iso).zip 2.28 + du -h $PWD/$(basename "$ISO" .iso).zip 2.29 umount $mnt 2.30 rm -rf $mnt 2.31 } 2.32 @@ -581,7 +583,7 @@ 2.33 [ $? -eq 0 ] || return 2.34 fi 2.35 gettazboot tazboot.exe 2.36 - ls -l $PWD/tazboot.exe 2.37 + du -h $PWD/tazboot.exe 2.38 } 2.39 2.40 md5() 2.41 @@ -642,7 +644,7 @@ 2.42 [ $? -eq 0 ] || return 2.43 fi 2.44 cp $media/boot/bzImage linux.exe 2.45 - ls -l $PWD/linux.exe 2.46 + du -h $PWD/linux.exe 2.47 } 2.48 2.49 memtest() 2.50 @@ -658,7 +660,7 @@ 2.51 [ $? -eq 0 ] || return 2.52 fi 2.53 gotcdfile 'memtest*' && cp $file memtest.exe 2.54 - ls -l $PWD/memtest.exe 2.55 + du -h $PWD/memtest.exe 2.56 } 2.57 2.58 mkfat12() 2.59 @@ -724,7 +726,7 @@ 2.60 [ $? -eq 0 ] || return 2.61 fi 2.62 cp $file $(basename $file).exe 2.63 - ls -l $PWD/$(basename $file).exe 2.64 + du -h $PWD/$(basename $file).exe 2.65 } 2.66 2.67 fdpxe() 2.68 @@ -795,7 +797,7 @@ 2.69 2.70 misspkg() 2.71 { 2.72 - for i in zip kexec-tools posixovl cdrkit ; do 2.73 + for i in zip kexec-tools posixovl cdrkit cdrkit-isoinfo ; do 2.74 [ -d /var/lib/tazpkg/installed/$i/ ] && continue 2.75 [ "$1" != "install" ] && menuitem "$@" && return 2.76 tazpkg get-install $i 2.77 @@ -1274,7 +1276,7 @@ 2.78 printf "mv %s fd%03d.img\n" $file $(($r+$n)) 2.79 n=$(($n+1)) 2.80 done | sh 2.81 - ls fd???.img 2.82 + du -ch $PWD/fd???.img 2.83 } 2.84 2.85 quit()