# HG changeset patch # User Pascal Bellard # Date 1459841860 -7200 # Node ID b9aedd1a72c0cbd260144c076acef589142dd1bc # Parent bb2e9d803029a52c9613f79a744ad8f8d32ca99c syslinux/taziso: fix inst*2zip diff -r bb2e9d803029 -r b9aedd1a72c0 beautifulsoup/receipt --- a/beautifulsoup/receipt Sun Apr 03 13:42:07 2016 +0200 +++ b/beautifulsoup/receipt Tue Apr 05 09:37:40 2016 +0200 @@ -10,6 +10,7 @@ TARBALL="$SOURCE-$VERSION.tar.gz" WEB_SITE="http://www.crummy.com/software/BeautifulSoup/" WGET_URL="${WEB_SITE}bs4/download/${VERSION%.*}/$TARBALL" +PROVIDES="python-beautifulsoup" TAGS="parser XML HTML" DEPENDS="python" diff -r bb2e9d803029 -r b9aedd1a72c0 syslinux/stuff/iso2exe/taziso --- a/syslinux/stuff/iso2exe/taziso Sun Apr 03 13:42:07 2016 +0200 +++ b/syslinux/stuff/iso2exe/taziso Tue Apr 05 09:37:40 2016 +0200 @@ -198,7 +198,9 @@ unset useposixovl blkid | grep $(df $mnt | sed '$!d;s/ .*/:/') | \ grep -qiE "(msdos|vfat|ntfs)" && useposixovl=YES - + case "$mnt" in + *mkzip*) useposixovl=YES + esac mkdir -p $mnt/slitaz/boot $mnt/slitaz/mnt/dos [ "$useposixovl" ] && if ! mount.posixovl -F $mnt/slitaz -- \ @@ -407,7 +409,7 @@ device= packages_list= packages_dir= - mnt=/tmp/mnt$$ + mnt=/tmp/mkzipmnt$$ mkdir -p $mnt $1 $2 || return for i in bootlace.com grubinst.exe grldr ; do @@ -464,7 +466,7 @@ zip -zr9 $(basename "$ISO" .iso).zip slitaz ) [ "$(which advzip)" ] && advzip -z4 $mnt/*.zip mv $mnt/*.zip . - ls -l $PWD/$(basename "$ISO" .iso).zip + du -h $PWD/$(basename "$ISO" .iso).zip umount $mnt rm -rf $mnt } @@ -581,7 +583,7 @@ [ $? -eq 0 ] || return fi gettazboot tazboot.exe - ls -l $PWD/tazboot.exe + du -h $PWD/tazboot.exe } md5() @@ -642,7 +644,7 @@ [ $? -eq 0 ] || return fi cp $media/boot/bzImage linux.exe - ls -l $PWD/linux.exe + du -h $PWD/linux.exe } memtest() @@ -658,7 +660,7 @@ [ $? -eq 0 ] || return fi gotcdfile 'memtest*' && cp $file memtest.exe - ls -l $PWD/memtest.exe + du -h $PWD/memtest.exe } mkfat12() @@ -724,7 +726,7 @@ [ $? -eq 0 ] || return fi cp $file $(basename $file).exe - ls -l $PWD/$(basename $file).exe + du -h $PWD/$(basename $file).exe } fdpxe() @@ -795,7 +797,7 @@ misspkg() { - for i in zip kexec-tools posixovl cdrkit ; do + for i in zip kexec-tools posixovl cdrkit cdrkit-isoinfo ; do [ -d /var/lib/tazpkg/installed/$i/ ] && continue [ "$1" != "install" ] && menuitem "$@" && return tazpkg get-install $i @@ -1274,7 +1276,7 @@ printf "mv %s fd%03d.img\n" $file $(($r+$n)) n=$(($n+1)) done | sh - ls fd???.img + du -ch $PWD/fd???.img } quit()