--- builds_bin/build_ISO	2010/07/24 15:28:38	1.33
+++ builds_bin/build_ISO	2012/05/25 17:47:34	1.36
@@ -15,19 +15,6 @@ then
     exit 1
 fi
 
-# remove package that are no longer in the distro
-if [ "$distrel" == "8" ]
-then
-    find -name 'samba-*.sme.*' -print0 -o \
-         -name 'libsmbclient-*.sme.*' -print0 -o \
-         -name 'libtalloc-*.sme.*' -print0 -o \
-         -name 'libtdb-*.sme.*' -print0 -o \
-         -name 'tdb-tools-*.sme.*' -print0 \
-         -name 'libtdb-*.sme.*' -print0 \
-    | xargs -r0 rm
-fi
-
-
 for img in product updates
 do
     if [ "$distrel" == "7" ]
@@ -89,7 +76,10 @@ 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/
 
@@ -116,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" \