--- builds_bin/build_ISO	2007/11/07 17:19:07	1.17
+++ builds_bin/build_ISO	2008/09/13 01:26:40	1.24
@@ -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 \
@@ -38,12 +42,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
 
@@ -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/
@@ -69,8 +73,7 @@ mkisofs $mkisopts \
     -b "$bootimg" \
     -c "$bootcat" \
     -no-emul-boot -boot-load-size 4 -boot-info-table \
-    -x lost+found \
-    -x CVS \
+    -x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \
     -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso \
     $(pwd)/$distarch/
 
@@ -78,10 +81,23 @@ 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
 
+rsync -a --delete --delete-excluded \
+    --exclude 'repodata/' --exclude 'product/' --exclude 'updates/' \
+    --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 \
+    -t ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.template \
+    --label SMEmirror=$distarch.jigdo/ \
+    --uri SMEmirror=http://mirror.contribs.org/releases/testing/$distrel/smeos/$distarch/ \
+    $distarch.jigdo//
+rm -rf $distarch.jigdo/
+
 if [ -d SRPMS -a "$distarch" == "i386" ]
 then
     rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso ../iso/$distrel/source/$disttag-SRPMS.iso
@@ -89,8 +105,7 @@ then
     mkisofs $mkisopts \
 	-V "$distname $distvers SRPMS" \
 	-A "$distname SRPMS created on $today" \
-	-x lost+found \
-	-x CVS \
+	-x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \
 	-o ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso \
 	--graft-points \
 	./SRPMS=SRPMS \
@@ -99,10 +114,17 @@ 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
+
+    jigdo-file make-template --force \
+	-i ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso \
+	-j ../iso/$distrel/source/$disttag-$distvers-SRPMS.jigdo \
+	-t ../iso/$distrel/source/$disttag-$distvers-SRPMS.template \
+	--label SMEmirror=SRPMS/ \
+	--uri SMEmirror=http://mirror.contribs.org/releases/testing/$distrel/smeos/SRPMS/ \
+	SRPMS//
 fi
 
 # That's it.
-