--- builds_bin/build_ISO 2007/12/27 15:23:15 1.19 +++ builds_bin/build_ISO 2008/07/26 21:51:02 1.23 @@ -2,10 +2,13 @@ distname='SME Server' disttag='smeserver' -distvers=$(basename $(pwd)) +distvers=$(basename $(readlink -f $(pwd))) distrel=${distvers:0:1} distarch=$(uname -i) +exec < /dev/null +exec &> build_ISO.$distarch + if ! [ -d $distarch ] then echo "No $distarch directory?" @@ -19,7 +22,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 \ @@ -51,9 +55,9 @@ rm -f ../iso/$distrel/$distarch/$disttag if [ "$distrel" == "7" ] then - createrepo $(pwd)/$distarch/ + createrepo --update --database $(pwd)/$distarch/ else - createrepo -g repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/ + createrepo --update --database --groupfile repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/ fi sync; rm -rf $(pwd)/$distarch/.olddata repoview $(pwd)/$distarch/ @@ -105,4 +109,3 @@ then fi # That's it. -