Author: glen Date: Mon May 15 20:29:28 2006 GMT
Module: admin Tag: AC-branch
---- Log message:
- more variables and checks
---- Files affected:
admin/ftp:
geniso-poldek (1.15.2.26 -> 1.15.2.27)
---- Diffs:
================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.26 admin/ftp/geniso-poldek:1.15.2.27
--- admin/ftp/geniso-poldek:1.15.2.26 Wed Apr 19 18:21:48 2006
+++ admin/ftp/geniso-poldek Mon May 15 22:29:22 2006
@@ -16,6 +16,8 @@
#MKISOFS=$ROOT/.stat/bin/mkisofs
MKISOFS="/usr/bin/mkisofs"
+ISOINFO="/usr/bin/isoinfo"
+
#ISOTMPDIR=""
ISOTMPDIR="$HOME/tmp"
@@ -41,6 +43,11 @@
#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
+
# directory with geniso-poldek and poldek-iso.priority
#GENDIR="/home/users/pldac/admin/ftp"
GENDIR=`pwd`
@@ -55,6 +62,11 @@
MEDIA="CD"
fi
+# make ROOT with full path
+if [[ $ROOT != /* ]]; then
+ ROOT=$(pwd)/$ROOT
+fi
+
POLDEK_OLD=
if ($POLDEK --version | grep -qE '0\.18\.'); then
POLDEK_OLD="yes"
@@ -105,11 +117,11 @@
UTILS_SIZE=0
case "${ARCH}" in
i?86)
- UTILS_SIZE=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,inst,images} | grep total | xargs |
cut -d" " -f1)
+ 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))
;;
amd64|x86_64)
- UTILS_SIZE_1=$(du -scmD
$ROOT/dists/${DIST}/PLD/i386/PLD/dosutils | grep total | xargs | cut -d" " -f1)
+ 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))
;;
@@ -137,6 +149,7 @@
MAINISODIR=`mktemp -d ${ISOTMPDIR}/pld-${ARCH}.iso.dir.XXXXXX` || exit 1
+ # stage 1: prepare poldek indexes
for NR in $(seq 1 ${COUNT}); do
echo "Processing ${MEDIA}${NR}"
@@ -148,10 +161,10 @@
i?86|athlon)
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images
${ISODIR}/PLD/images
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst
${ISODIR}/PLD/inst
- ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
+ ln -s
${ROOT}/dists/${DIST}/PLD/${X86_BASE_ARCH}/PLD/dosutils ${ISODIR}/PLD/dosutils
;;
amd64|x86_64)
- ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
+ ln -s
${ROOT}/dists/${DIST}/PLD/${X86_BASE_ARCH}/PLD/dosutils ${ISODIR}/PLD/dosutils
do_symlink ${ISOCD}/amd64 ${ISODIR}/
;;
ppc)
@@ -201,6 +214,7 @@
done
+ # stage 2: creating real isos
for NR in $(seq 1 ${COUNT}); do
ISODIR=$MAINISODIR/$NR
@@ -235,7 +249,7 @@
echo "Generating ls and md5sum for ${ISONAME}.iso"
cd ${ISOTARGET}/iso/${DIST}/${ARCH}
- /usr/bin/isoinfo -R -l -i ${ISONAME}.iso > ${ISONAME}.ls
+ ${ISOINFO} -R -l -i ${ISONAME}.iso > ${ISONAME}.ls
md5sum ${ISONAME}.iso >> pld-${DIST}-${SUBVER}.${ARCH}.md5
rm -rf ${ISODIR}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.26&r2=1.15.2.27&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
