--- builds_bin/build_ISO	2009/11/03 22:35:28	1.29
+++ 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 \
@@ -53,14 +56,22 @@ then
 	$(pwd)/$distarch/
 fi
 
-rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag.iso
+rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso* ../iso/$distrel/$distarch/$disttag-$distarch.iso
+rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch-netinstall.iso*
 rm -f ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.jigdo ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.template
 
 if [ "$distrel" == "7" ]
 then
     createrepo --update --database $(pwd)/$distarch/
-else
+elif [ "$distrel" == "8" ]
+then
     createrepo --update --database --groupfile repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/
+elif [ "$distrel" == "9" -o  "$distrel" == "10" ]
+then
+    mkdir -p $(pwd)/$distarch/repodata/
+    rm -f  $(pwd)/$distarch/repodata/*comps.xml*
+    /bin/cp -af $(pwd)/$distarch/Packages/base/comps.xml $(pwd)/$distarch/repodata/
+    createrepo --database --update --skip-symlinks --simple-md-filenames --groupfile repodata/comps.xml $(pwd)/$distarch/
 fi
 sync; rm -rf $(pwd)/$distarch/.olddata $(pwd)/$distarch/repodata/repoview $(pwd)/$distarch/repoview
 repoview $(pwd)/$distarch/
@@ -70,28 +81,55 @@ bootimg='isolinux/isolinux.bin'
 bootcat='isolinux/boot.cat'
 mkisopts='-v -U -J -r -T'
 today="$(date '+%d %b %Y')"
-mkisofs $mkisopts \
-    -V "$distname $distvers" \
-    -A "$distname created on $today" \
-    -b "$bootimg" \
-    -c "$bootcat" \
-    -no-emul-boot -boot-load-size 4 -boot-info-table \
+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" \
+    -no-emul-boot -boot-load-size 4 -boot-info-table -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/
+fi
 
-/usr/lib/anaconda-runtime/implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
-dd if=/dev/zero bs=2048 count=150 >> ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+cp -a $(pwd)/$distarch/images/boot.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch-netinstall.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
+else
+    implantisomd5 ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
+fi
 md5sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.md5sum
 sha1sum ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso | sed 's,\.\..*/,,' > ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso.sha1sum
 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
+mv ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distarch.iso
+ln -sf $disttag-$distarch.iso ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso
 
 rsync -a --delete --delete-excluded \
     --exclude 'repodata/' --exclude 'product/' --exclude 'updates/' --exclude 'repoview/' \
     --exclude 'lost+found/' --exclude 'CVS/' --exclude 'buildinstall.tree.*/' \
     --link-dest=../$distarch/ $distarch/ $distarch.jigdo/
+
 jigdo-file make-template --force \
     -i ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso \
     -j ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.jigdo \
@@ -101,18 +139,15 @@ 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
+    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso* ../iso/$distrel/source/$disttag-SRPMS.iso*
 
-    mkisofs $mkisopts \
-	-V "$distname $distvers SRPMS" \
-	-A "$distname SRPMS created on $today" \
+    mkisofs $mkisopts -V "$distname" \
+	-A "$distname $distvers SRPMS created on $today" \
 	-x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \
 	-o ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso \
-	--graft-points \
-	./SRPMS=SRPMS \
-	GPL=$distarch/GPL \
+	--graft-points ./SRPMS=SRPMS GPL=$distarch/GPL \
 	RPM-GPG-KEY-SMEServer=$distarch/RPM-GPG-KEY-SMEServer
 
     md5sum ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso | sed 's,\.\..*/,,' > ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.md5sum
@@ -127,7 +162,7 @@ then
 	-t ../iso/$distrel/source/$disttag-$distvers-SRPMS.template \
 	--label SMEmirror=SRPMS/ \
 	--uri SMEmirror=http://mirror.contribs.org/releases/testing/$distrel/smeos/SRPMS/ \
-	SRPMS//
+	SRPMS/
 fi
 
 # That's it.