admin (AC-branch): ftp/geniso-poldek - adjusted for final Ac - cha...

[hawk]

Author: hawk                         Date: Thu Apr 12 18:37:31 2007 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- adjusted for final Ac
- changes CD size to 700 MB
- cleanup

---- Files affected:
admin/ftp:
   geniso-poldek (1.15.2.29 -> 1.15.2.30) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.29 admin/ftp/geniso-poldek:1.15.2.30
--- admin/ftp/geniso-poldek:1.15.2.29	Sun Jul 23 19:59:12 2006
+++ admin/ftp/geniso-poldek	Thu Apr 12 20:37:26 2007
@@ -18,35 +18,23 @@
 
 ISOINFO="/usr/bin/isoinfo"
 
-#ISOTMPDIR=""
 ISOTMPDIR="$HOME/tmp"
 
-#ISOTARGET="/iso"
 ISOTARGET="/home/users/pldftpac/isos"
 
 # directory with copied contents of rescuecd and ppcrcd iso images
 # in arch subdirs (like isocd/{i486,amd64,ppc})
 ISOCD="/home/users/pldftpac/isocd/"
 
-#DIST="ra"
 DIST="2.0"
 
-#NAME="Ac"
 NAME="Ac"
 
-#TODAYS DATE
-DATA="20060312"
-
-#VERSION="2.0"
 VERSION="2.0"
 
-#SUBVER="alpha-1"
-SUBVER="RC1"
-
 # arch, from whose directory dosutils, inst and images are copied (for x86 and x86_64)
 # "i386" for official isos (running off ftp), "i686" if you play on your own.
-X86_BASE_ARCH=i386
-#X86_BASE_ARCH=i686
+X86_BASE_ARCH=i686
 
 # directory with geniso-poldek and poldek-iso.priority
 #GENDIR="/home/users/pldac/admin/ftp"
@@ -58,7 +46,7 @@
 	MEDIA="DVD"
 else
 	ARCHLIST="i386 i586 i686 athlon amd64 ppc"
-	CDROM_SIZE=650
+	CDROM_SIZE=700
 	MEDIA="CD"
 fi
 
@@ -78,7 +66,7 @@
   ___ _    ___  
  | _ \ |  |   \  
  |  _/ |__| |) | Linux Distribution ${VERSION} (${NAME}) 
- |_| |____|___/  ${SUBVER} ${DATE} Version ISO image
+ |_| |____|___/  ISO image
 
                      ftp://ftp.pld-linux.org/
 
@@ -91,7 +79,7 @@
 }
 
 rel_info() {
-echo -n "PLD ${VERSION} (${NAME}) ${SUBVER} ${DATA} "
+echo -n "PLD ${VERSION} (${NAME}) "
 }
 
 do_symlink() {
@@ -118,18 +106,18 @@
     case "${ARCH}" in
 	i?86)
 		UTILS_SIZE=$(du -scmD $ROOT/dists/${DIST}/PLD/${X86_BASE_ARCH}/PLD/{dosutils,inst,images} | grep total  | xargs | cut -d" " -f1)
-		UTILS_SIZE=$(($UTILS_SIZE + 10))
+		UTILS_SIZE=$(($UTILS_SIZE + 30))
 	;;
 	amd64|x86_64)
 		UTILS_SIZE_1=$(du -scmD $ROOT/dists/${DIST}/PLD/${X86_BASE_ARCH}/PLD/dosutils | grep total  | xargs | cut -d" " -f1)
 		UTILS_SIZE_2=$(du -scmD ${ISOCD}/amd64 | grep total  | xargs | cut -d" " -f1)
-		UTILS_SIZE=$(($UTILS_SIZE_1 + $UTILS_SIZE_2 + 10))
+		UTILS_SIZE=$(($UTILS_SIZE_1 + $UTILS_SIZE_2 + 30))
 	;;
 	ppc)
 		UTILS_SIZE_1=$(du -scmD ${ISOCD}/ppc | grep total  | xargs | cut -d" " -f1)
 		# HFS table size, 1.7%
 		UTILS_SIZE_2=$(echo "1.7*${CDROM_SIZE}/100" | bc)
-		UTILS_SIZE=$(($UTILS_SIZE_1 + $UTILS_SIZE_2 + 10))
+		UTILS_SIZE=$(($UTILS_SIZE_1 + $UTILS_SIZE_2 + 30))
 	;;
     esac
 	
@@ -141,7 +129,9 @@
     $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
 
     echo "Generating split files"
-    $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
+
+    $POLDEK \
+	-s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
 	--split=${CDROM_SIZE}:${UTILS_SIZE} \
     	--split-conf=./poldek-iso.priority \
 	--split-out=${ISOTMPDIR}/pld-${ARCH}.iso.list || exit 1
@@ -218,7 +208,7 @@
     for NR in $(seq 1 ${COUNT}); do
 	ISODIR=$MAINISODIR/$NR
 
-	ISONAME="pld-${DIST}-${SUBVER}-${MEDIA}$(printf "%02d" "$NR").${ARCH}"	
+	ISONAME="pld-${DIST}-${MEDIA}$(printf "%02d" "$NR").${ARCH}"	
 	if [ "${NR}" = "1" ]; then
 	    BOOTOPT=""
 	    case "$ARCH" in
@@ -250,7 +240,7 @@
 	echo "Generating ls and md5sum for ${ISONAME}.iso"
 	cd ${ISOTARGET}/iso/${DIST}/${ARCH}
 	${ISOINFO} -R -l -i ${ISONAME}.iso > ${ISONAME}.ls
-	md5sum ${ISONAME}.iso >> pld-${DIST}-${SUBVER}.${ARCH}.md5
+	md5sum ${ISONAME}.iso >> pld-${DIST}.${ARCH}.md5
 
 	rm -rf ${ISODIR}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.29&r2=1.15.2.30&f=u