--- builds_bin/build_ISO	2007/04/14 21:21:22	1.9
+++ builds_bin/build_ISO	2007/05/19 21:55:09	1.10
@@ -1,29 +1,5 @@
 #!/bin/sh
 
-# Charlie Brady wrote on smeserver-developer:
-# [I'm sure I've said this before, but ...] there's no new anaconda SRPM. 
-# The cdrom image I've been using comes directly from a CentOS one.
-
-# 
-# What I've done is:
-# 
-# - add CentOS/base/updates.img, made using mkcramfs from the updates directory
-# - delete unwanted RPMs
-# - add wanted RPMs
-# - replace comps.xml
-# - add install.cfg and update.cfg
-# - edit isolinux/isolinux.cfg
-# 
-# Run this in the a 7.0alphaXX directory, containing cdrom.image 
-# which contains the directory tree:
-
-
-echo "Checking packages not installed in CentOS workstation group"
-for package in anaconda anaconda-runtime bogl booty createrepo mkisofs zsync
-do
-    rpm -q $package || exit "$package must be installed"
-done
-
 [ -d cdrom.image ] || (echo "No cdrom.image directory?"; exit 1)
 
 distname='SME Server'
@@ -45,7 +21,7 @@ PYTHONPATH=/usr/lib/anaconda/ /usr/lib/a
 
 PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \
 	$(pwd)/cdrom.image \
-	i386 > pkgorder
+	$(uname -i) > pkgorder
 
 PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/genhdlist \
 	--withnumbers \
@@ -84,6 +60,8 @@ zsyncmake $disttag-$distvers.iso
 mv $disttag-$distvers.iso $disttag.iso
 ln -sf $disttag.iso $disttag-$distvers.iso
 
+[ -d SRPMS ] || (echo "No SRPMS directory?"; exit 1)
+
 echo "Building SRPMS ISO"
 
 rm -f $disttag-SRPMS.iso $disttag-$distvers-SRPMS.iso
@@ -98,9 +76,7 @@ mkisofs $mkisopts \
         --graft-points \
         ./SRPMS=SRPMS \
         GPL=cdrom.image/GPL \
-        RPM-GPG-KEY=cdrom.image/RPM-GPG-KEY \
-        RPM-GPG-KEY-centos4=cdrom.image/RPM-GPG-KEY-centos4 \
-        RPM-GPG-KEY-SMEServer7=cdrom.image/RPM-GPG-KEY-SMEServer7
+        RPM-GPG-KEY-SMEServer7=cdrom.image/RPM-GPG-KEY-SMEServer
 
 md5sum $disttag-$distvers-SRPMS.iso > $disttag-$distvers-SRPMS.iso.md5sum
 zsyncmake $disttag-$distvers-SRPMS.iso