--- builds_bin/build_ISO	2008/09/13 01:26:40	1.24
+++ builds_bin/build_ISO	2012/05/25 17:47:34	1.36
@@ -19,6 +19,8 @@ for img in product updates
 do
     if [ "$distrel" == "7" ]
     then
+        rm -f $(pwd)/$distarch/SME/base/comps.rpm
+        cp -al $(pwd)/$distarch/SME/RPMS/comps-*.rpm $(pwd)/$distarch/SME/base/comps.rpm
 	/usr/bin/mkcramfs \
 	$(pwd)/$distarch/$img \
 	$(pwd)/$distarch/SME/base/$img.img
@@ -51,7 +53,8 @@ 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.jigdo ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.template
 
 if [ "$distrel" == "7" ]
 then
@@ -59,7 +62,7 @@ then
 else
     createrepo --update --database --groupfile repodata/comps.xml -u "media://$(head -1 $distarch/.discinfo)" $(pwd)/$distarch/
 fi
-sync; rm -rf $(pwd)/$distarch/.olddata
+sync; rm -rf $(pwd)/$distarch/.olddata $(pwd)/$distarch/repodata/repoview $(pwd)/$distarch/repoview
 repoview $(pwd)/$distarch/
 sync; rm -rf $(pwd)/$distarch/.repodata
 
@@ -73,20 +76,23 @@ mkisofs $mkisopts \
     -b "$bootimg" \
     -c "$bootcat" \
     -no-emul-boot -boot-load-size 4 -boot-info-table \
-    -x lost+found -x product -x updates -x 'buildinstall.tree.*' -x CVS \
+    -x lost+found -x 'buildinstall.tree.*' -x CVS \
+    -x $(pwd)/$distarch/images/boot.iso -x $(pwd)/$distarch/images/diskboot.img \
+    -x $(pwd)/$distarch/images/xen -x $(pwd)/$distarch/images/pxeboot \
+    -x $(pwd)/$distarch/product -x $(pwd)/$distarch/updates \
     -o ../iso/$distrel/$distarch/$disttag-$distvers-$distarch.iso \
     $(pwd)/$distarch/
 
 /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
-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
+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 '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 \
@@ -100,7 +106,7 @@ 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
+    rm -f ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso* ../iso/$distrel/source/$disttag-SRPMS.iso*
 
     mkisofs $mkisopts \
 	-V "$distname $distvers SRPMS" \
@@ -112,8 +118,8 @@ then
 	GPL=$distarch/GPL \
 	RPM-GPG-KEY-SMEServer=$distarch/RPM-GPG-KEY-SMEServer
 
-    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
+    md5sum ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso | sed 's,\.\..*/,,' > ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.md5sum
+    sha1sum ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso | sed 's,\.\..*/,,' > ../iso/$distrel/source/$disttag-$distvers-SRPMS.iso.sha1sum
     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