admin (AC-branch): ftp/geniso-SRPMS - killed $SUBVER, fixed DVD si...

[hawk]

Author: hawk                         Date: Wed Apr 18 13:45:04 2007 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- killed $SUBVER, fixed DVD size, use 700 MB for CDs

---- Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.7 -> 1.1.2.8) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.7 admin/ftp/geniso-SRPMS:1.1.2.8
--- admin/ftp/geniso-SRPMS:1.1.2.7	Thu Mar 23 02:18:52 2006
+++ admin/ftp/geniso-SRPMS	Wed Apr 18 15:44:59 2007
@@ -2,7 +2,6 @@
 
 ROOT="/pld/ftp"
 VERSION="2.0"
-SUBVER="RC1"
 
 MKISOFS="/usr/bin/mkisofs"
 
@@ -15,10 +14,10 @@
 size=0
 fileno=1
 if [ "$1" = "dvd" ]; then
-  iso_size=`expr 1024 \* 1024 \* 4500`
+  iso_size=`expr 1024 \* 1024 \* 4482`
   MEDIA="DVD"
 else
-  iso_size=`expr 1024 \* 1024 \* 650`
+  iso_size=`expr 1024 \* 1024 \* 700`
   MEDIA="CD"
 fi
 listd=${ISOTMPDIR}/cd${fileno}.links
@@ -54,13 +53,13 @@
 for i in ${ISOTMPDIR}/cd*.links ; do
 	num=`echo $i | sed 's/\/.*\/cd\([0-9]\+\)\.links/\1/'`
 
-	ISONAME="pld-${VERSION}-${SUBVER}-${MEDIA}${num}.SRPMS"
+	ISONAME="pld-${VERSION}-${MEDIA}${num}.SRPMS"
 	${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso \
 	-f -r -J -f $i || rm -f ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso
 
 	echo "Generating ls and md5sum for ${ISONAME}.iso"
 	cd ${ISOTARGET}/iso/${VERSION}/SRPMS
 	/usr/bin/isoinfo -R -l -i ${ISONAME}.iso > ${ISONAME}.ls
-	md5sum ${ISONAME}.iso >> pld-${VERSION}-${SUBVER}.SRPMS.md5
+	md5sum ${ISONAME}.iso >> pld-${VERSION}.SRPMS.md5
 done
 rm -fr ${ISOTMPDIR}/cd*.links
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.7&r2=1.1.2.8&f=u