Author: hawk Date: Wed Mar 22 18:31:45 2006 GMT
Module: admin Tag: AC-branch
---- Log message:
- removed set -{x,e}, added some echos
- cleanup
---- Files affected:
admin/ftp:
geniso-poldek (1.15.2.22 -> 1.15.2.23)
---- Diffs:
================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.22 admin/ftp/geniso-poldek:1.15.2.23
--- admin/ftp/geniso-poldek:1.15.2.22 Wed Mar 22 18:19:38 2006
+++ admin/ftp/geniso-poldek Wed Mar 22 19:31:40 2006
@@ -1,9 +1,6 @@
#!/bin/sh
# geniso-poldek: Arkadiusz Miskiewicz <[EMAIL PROTECTED]>, 2001
-set -x
-set -e
-
umask 022
ROOT="/mnt/ftpcz"
PATH=$ROOT/.stat/bin:$PATH; export PATH
@@ -98,8 +95,6 @@
fi
}
-# cd $ROOT/.stat/packages && cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot up -A
poldek-iso.priority
-
for ARCH in ${ARCHLIST}; do
UTILS_SIZE=0
@@ -121,17 +116,14 @@
;;
esac
- echo "Generating ISOs for ${ARCH}, size ${SIZE}"
+ echo "Generating ISOs for ${ARCH}"
rm -rf ${ISOTMPDIR}/pld-${ARCH}*iso*
-# if [ -n "$POLDEK_OLD" ]; then
-# $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --mkidxz
-# else
-# $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pndir
-# $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pdir
-# fi
+ echo "Checking/updating package indexes"
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
+
+ echo "Generating split files"
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
--split=${CDROM_SIZE}:${UTILS_SIZE} \
--split-conf=./poldek-iso.priority \
@@ -142,6 +134,7 @@
for NR in $(seq 1 ${COUNT}); do
+ echo "Processing CD${NR}"
ISODIR=$MAINISODIR/$NR
ISODIR0=$MAINISODIR/1
mkdir -p ${ISODIR}/PLD || exit 1
@@ -166,25 +159,20 @@
echo "# priorites of packages used during generation of cd images"
>${ISODIR0}/.pkgsplit.conf
cat ./poldek-iso.priority >>${ISODIR0}/.pkgsplit.conf
-# elif [ "${NR}" = "$COUNT" ]; then
-# mkdir -p ${ISODIR}/test/
-# cp -a ${ROOT}/test/${ARCH}/ ${ISODIR}/test/${ARCH}/
-# mkdir -p ${ISODIR}/supported/
-# cp -a ${ROOT}/supported/${ARCH}/
${ISODIR}/supported/${ARCH}/
fi
mkdir -p ${ISODIR}/PLD/RPMS
-# ln -s . ${ISODIR}/PLD/RPMS/RPMS
FSUFFIX="$((${NR} - 1))"
[ -z "$POLDEK_OLD" ] && FSUFFIX="$(printf "%02d" "$FSUFFIX")"
+ echo "Creating temporary symlinks"
for file in $(cat ${ISOTMPDIR}/pld-${ARCH}.iso.list.${FSUFFIX}); do
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/${file} \
${ISODIR}/PLD/RPMS/${file}
done
- # $POLDEK
+ echo "Generating indexes"
if ($POLDEK --version | grep -qE '0\.18\.'); then
$POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz
else
@@ -206,7 +194,6 @@
rel_info > ${ISODIR}/pld-version
echo "CD${NR} ${ARCH}" >> ${ISODIR}/pld-version
-
done
for NR in $(seq 1 ${COUNT}); do
@@ -253,6 +240,3 @@
rm -rf ${ISOTMPDIR}/pld-${ARCH}.iso*
done
-
-# ./geniso-mini
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.22&r2=1.15.2.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
