admin (AC-branch): ftp/geniso-mini - adjusted for poldek 0.20 - ad...

[hawk]

Author: hawk                         Date: Sun Feb 19 22:31:07 2006 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- adjusted for poldek 0.20
- adjusted for current installer
- some cleanups
- changed .iso naming (example: pld-2.0-RC1-MINI.i386.iso)

---- Files affected:
admin/ftp:
   geniso-mini (1.20.2.1 -> 1.20.2.2) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-mini
diff -u admin/ftp/geniso-mini:1.20.2.1 admin/ftp/geniso-mini:1.20.2.2
--- admin/ftp/geniso-mini:1.20.2.1	Sat Oct  1 12:33:55 2005
+++ admin/ftp/geniso-mini	Sun Feb 19 23:31:01 2006
@@ -4,39 +4,31 @@
 set -x
 umask 022
 export LC_ALL=C
-ROOT="/mnt/ftpcz"
+ROOT="/pld/ftp"
 PATH=$ROOT/.stat/bin:$PATH; export PATH
 
 #ARCHLIST="athlon i386 i586 i686"
-ARCHLIST="i386 i586 i686 athlon"
+ARCHLIST="i386"
 
-DIST=ac
+DIST="2.0"
 
-#DATA=20040101
-DATA=20050616
+DATA="20060219"
 
-#ARCHLIST="i586"
-#ROOT="/adm/ftp"
-
-#MKISOFSOPT="-print-size"
 MKISOFSOPT="-quiet"
 
-#BOOTDISK="PLD/images/bootdisk.img"
 BOOTDISK="PLD/images/bootdisk_iso.img"
 
-#ISOTMPDIR=""
 ISOTMPDIR="$HOME/tmp"
 
-#ISOTARGET="/iso"
-ISOTARGET="/home/users/pldftpac/isos"
+ISOTARGET="/pld/ftp"
 
 POLDEK="/usr/bin/poldek"
 #POLDEK=$ROOT/.stat/bin/poldek-$DIST
 
-#MKISOFS="/usr/bin/mkisofs"
 MKISOFS="/usr/bin/mkisofs"
 
-VERSION="Ac"
+VERSION="2.0"
+NAME="Ac"
 SUBVER="RC1"
 
 pld_info() {
@@ -94,11 +86,11 @@
       ;;
     esac
 
-    add_pkgs="reiserfsprogs e2fsprogs jfsutils xfsprogs dhcpcd raidtools mdadm syslog"
+    add_pkgs=""
 
     pkgs=`$POLDEK -V -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
     	--pset mini-iso.lst $add_pkgs $arch_pkgs | \
-    	egrep '(^mark | marks )' | sed -e 's/^mark //; s/.* marks //' | xargs`
+    	egrep '(^mark | marks )' | sed -e 's/^mark //; s/.* marks //; s/(cap .*)//' | xargs`
 
     set +x
     for f in $pkgs ; do
@@ -106,27 +98,26 @@
     done
     set -x
     
-    $POLDEK -s $T/PLD/RPMS --mkidxz
+    $POLDEK -s $T/PLD/RPMS --mkidxz --mt=pdir
 
     # please don't change it. installer relayes on presence of this
     # file in cd image root
-    ISONAME="pld-${ARCH}-MINI-RC1"
+    ISONAME="pld-${DIST}-${SUBVER}-MINI.${ARCH}"
     
     touch $T/${ISONAME}
     pld_info > $T/PLD-README.txt
     
-    cp -r $R/inst/2.4.31-experimental $T/PLD/inst
+    cp -r $R/inst/2.4.32-experimental $T/PLD/inst
     rm -f $T/PLD/inst/{root,ui}-pkg.tar.gz
 #    rm -rf $T/PLD/inst/pkg/*experimental
 
     common_iso_opt="-J -R -r -V MINI-ISO -A PLD-Linux \
     	-P '<feedback at pld-linux.org>' \
     	-abstract PLD-README.txt ${MKISOFSOPT}"
-    
+
     case $ARCH in
       i*86 | athlon )
-        cp $R/images/experimental/*.img $T/PLD/images
-#        cp $R/images/slow/bootdisk_ide_slow.img $T/PLD/images
+        cp $R/images/*.img $T/PLD/images
 	BOOTOPT="-b ${BOOTDISK} -c PLD/images/boot.cat"
         echo "Running mkisofs for ${ISONAME}.iso"
 	${MKISOFS} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-mini?r1=1.20.2.1&r2=1.20.2.2&f=u