--- builds_bin/build_ISO 2007/11/07 17:19:07 1.17 +++ builds_bin/build_ISO 2008/03/17 03:08:23 1.20 @@ -19,7 +19,8 @@ do /usr/bin/mkcramfs \ $(pwd)/$distarch/$img \ $(pwd)/$distarch/SME/base/$img.img - else + elif [ -d "$(pwd)/$distarch/$img" ] + then /sbin/mksquashfs \ $(pwd)/$distarch/$img \ $(pwd)/$distarch/images/$img.img \ @@ -38,12 +39,12 @@ then PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \ --product SME \ $(pwd)/$distarch \ - $distarch > pkgorder + $distarch > pkgorder.$distarch PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/genhdlist \ --productpath SME \ --withnumbers \ - --fileorder pkgorder \ + --fileorder pkgorder.$distarch \ $(pwd)/$distarch/ fi @@ -78,7 +79,7 @@ mkisofs $mkisopts \ dd if=/dev/zero bs=2048 count=150 >> ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso md5sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.md5sum sha1sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.sha1sum -zsyncmake -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.zsync ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso +zsyncmake -u $disttag-$distvers-$distarch.iso -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.zsync ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso ln -sf $disttag.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso @@ -99,7 +100,7 @@ then md5sum ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso > ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.md5sum sha1sum ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso > ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.sha1sum - zsyncmake -o ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.zsync ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso + zsyncmake -u $disttag-$distvers-SRPMS.iso -o ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.zsync ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso mv ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso ../iso/$distrel/source/$disttag-SRPMS.iso ln -sf $disttag-SRPMS.iso ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso fi