--- builds_bin/build_ISO 2014/05/09 16:40:03 1.41 +++ builds_bin/build_ISO 2016/05/30 08:00:31 1.42 @@ -3,7 +3,7 @@ distname='SME Server' disttag='smeserver' distvers=$(basename $(readlink -f $(pwd))) -distrel=${distvers:0:1} +distrel=${distvers%%.*} distarch=$(uname -i) exec < /dev/null @@ -24,6 +24,9 @@ do /usr/bin/mkcramfs \ $(pwd)/$distarch/$img \ $(pwd)/$distarch/SME/base/$img.img + elif [ "$distrel" == "10" ] + then + echo "SME10 do nothing there,yet" elif [ -d "$(pwd)/$distarch/$img" ] then /sbin/mksquashfs \ @@ -63,7 +66,7 @@ then elif [ "$distrel" == "8" ] then createrepo --update --database --groupfile repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/ -elif [ "$distrel" == "9" ] +elif [ "$distrel" == "9" -o "$distrel" == "10" ] then mkdir -p $(pwd)/$distarch/repodata/ rm -f $(pwd)/$distarch/repodata/*comps.xml* @@ -78,6 +81,17 @@ bootimg='isolinux/isolinux.bin' bootcat='isolinux/boot.cat' mkisopts='-v -U -J -r -T' today="$(date '+%d %b %Y')" +if [ "$distrel" == "10" ] +then +mkisofs $mkisopts -V "$distname" \ + -A "$distname" \ + -volset "$distname" \ + -b "$bootimg" -c "$bootcat" \ + -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -x boot.iso \ + -x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \ + -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso \ + $(pwd)/$distarch/ +else mkisofs $mkisopts -V "$distname" \ -A "$distname $distvers created on $today" \ -b "$bootimg" -c "$bootcat" \ @@ -85,10 +99,20 @@ mkisofs $mkisopts -V "$distname" \ -x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \ -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso \ $(pwd)/$distarch/ +fi cp -a $(pwd)/$distarch/images/boot.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch-netinstall.iso -isohybrid ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso +if [ -x /usr/bin/isohybrid ] +then + #needs syslinux; should implement efi ? + # should not be necessary with centos7 : mkisofs/mkhybrids and genisoimage have been merged + isohybrid ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso +else + # alternative with mkhybrid ?? + echo "isohybrid not available; you should install syslinux or use genisoimage options" +fi + if [ -x /usr/lib/anaconda-runtime/implantisomd5 ] then /usr/lib/anaconda-runtime/implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso @@ -115,7 +139,7 @@ jigdo-file make-template --force \ $distarch.jigdo// rm -rf $distarch.jigdo/ -if [ -d SRPMS -a "$distarch" == "i386" ] +if [ -d SRPMS ] && [ "$distarch" == "i386" -o "$distrel" == "10" ] then rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso* ../iso/$distrel/source/$disttag-SRPMS.iso*