admin (AC-branch): ftp/geniso-mini, ftp/geniso-poldek - ac version
arekm
arekm at pld-linux.org
Sat Oct 1 12:34:01 CEST 2005
Author: arekm Date: Sat Oct 1 10:34:00 2005 GMT
Module: admin Tag: AC-branch
---- Log message:
- ac version
---- Files affected:
admin/ftp:
geniso-mini (1.20 -> 1.20.2.1) , geniso-poldek (1.15 -> 1.15.2.1)
---- Diffs:
================================================================
Index: admin/ftp/geniso-mini
diff -u admin/ftp/geniso-mini:1.20 admin/ftp/geniso-mini:1.20.2.1
--- admin/ftp/geniso-mini:1.20 Sat Nov 20 23:51:11 2004
+++ admin/ftp/geniso-mini Sat Oct 1 12:33:55 2005
@@ -4,15 +4,16 @@
set -x
umask 022
export LC_ALL=C
-ROOT="/home/ftp/pub/Linux/PLD"
+ROOT="/mnt/ftpcz"
PATH=$ROOT/.stat/bin:$PATH; export PATH
-ARCHLIST="athlon i386 i586 i686"
+#ARCHLIST="athlon i386 i586 i686"
+ARCHLIST="i386 i586 i686 athlon"
DIST=ac
#DATA=20040101
-DATA=20040114
+DATA=20050616
#ARCHLIST="i586"
#ROOT="/adm/ftp"
@@ -27,21 +28,24 @@
ISOTMPDIR="$HOME/tmp"
#ISOTARGET="/iso"
-ISOTARGET="/mnt/wrk"
+ISOTARGET="/home/users/pldftpac/isos"
-#POLDEK="/usr/bin/poldek"
-POLDEK=$ROOT/.stat/bin/poldek-$DIST
+POLDEK="/usr/bin/poldek"
+#POLDEK=$ROOT/.stat/bin/poldek-$DIST
#MKISOFS="/usr/bin/mkisofs"
MKISOFS="/usr/bin/mkisofs"
+VERSION="Ac"
+SUBVER="RC1"
+
pld_info() {
echo "
*************************************************************
___ _ ___
| _ \ | | \ (MINI)
- | _/ |__| |) | Linux 2.0 Ac
- |_| |____|___/ Development Version ISO image
+ | _/ |__| |) | Linux Distribution ${VERSION} (${NAME})
+ |_| |____|___/ ${SUBVER} ${DATE} Version ISO image
ftp://ftp.pld-linux.org/
@@ -106,12 +110,12 @@
# please don't change it. installer relayes on presence of this
# file in cd image root
- ISONAME="pld-${ARCH}-MINI-test-${DATA}"
+ ISONAME="pld-${ARCH}-MINI-RC1"
touch $T/${ISONAME}
pld_info > $T/PLD-README.txt
- cp -r $R/inst/2.4.27-experimental $T/PLD/inst
+ cp -r $R/inst/2.4.31-experimental $T/PLD/inst
rm -f $T/PLD/inst/{root,ui}-pkg.tar.gz
# rm -rf $T/PLD/inst/pkg/*experimental
@@ -121,7 +125,7 @@
case $ARCH in
i*86 | athlon )
- cp $R/images/*.img $T/PLD/images
+ cp $R/images/experimental/*.img $T/PLD/images
# cp $R/images/slow/bootdisk_ide_slow.img $T/PLD/images
BOOTOPT="-b ${BOOTDISK} -c PLD/images/boot.cat"
echo "Running mkisofs for ${ISONAME}.iso"
================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15 admin/ftp/geniso-poldek:1.15.2.1
--- admin/ftp/geniso-poldek:1.15 Tue Aug 3 14:39:56 2004
+++ admin/ftp/geniso-poldek Sat Oct 1 12:33:55 2005
@@ -5,7 +5,7 @@
set -e
umask 022
-ROOT="/home/ftp/pub/Linux/PLD"
+ROOT="/mnt/ftpcz"
PATH=$ROOT/.stat/bin:$PATH; export PATH
#ARCHLIST="i386 i586 i686"
@@ -19,16 +19,16 @@
# $POLDEK
#POLDEK=$ROOT/.stat/bin/poldek-ra
-POLDEK=~/ftp/.stat/bin/poldek
+POLDEK=/usr/bin/poldek
#MKISOFS=$ROOT/.stat/bin/mkisofs
-MKISOFS=$ROOT/.stat/bin/mkisofs
+MKISOFS=/usr/bin/mkisofs
#ISOTMPDIR=""
ISOTMPDIR=~/tmp
#ISOTARGET="/iso"
-ISOTARGET="/mnt/wrk"
+ISOTARGET="/home/users/pldftpac/isos"
#DIST="ra"
DIST=2.0
@@ -37,15 +37,15 @@
NAME="Ac"
#TODAYS DATE
-DATA="20040803"
+DATA="20050616"
#VERSION="2.0"
VERSION="2.0"
#SUBVER="alpha-1"
-SUBVER="alpha-6"
+SUBVER="RC1"
-UTILS_SIZE=$(du -scmD $ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,coinst,inst,images} | grep total | xargs | cut -d" " -f1)
+UTILS_SIZE=$(du -scmD $ROOT/dists/${DIST}/PLD/i386/PLD/{dosutils,inst/2.4.31-experimental,images/experimental} | grep total | xargs | cut -d" " -f1)
UTILS_SIZE=$(($UTILS_SIZE + 10))
CDROM_SIZE=650
@@ -81,14 +81,13 @@
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --mkidxz
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
- $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
+ $POLDEK -vv -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
--split=${CDROM_SIZE}:${UTILS_SIZE} \
- --split-conf=${ROOT}/.stat/packages/poldek-iso.priority \
+ --split-conf=/home/users/pldftpac/admin/ftp/poldek-iso.priority \
--split-out=${ISOTMPDIR}/pld-${ARCH}.iso.list || exit 1
COUNT="$(ls -1 ${ISOTMPDIR}/pld-${ARCH}.iso.list* | wc -l)"
-
- MAINISODIR=`mktemp -d ${ISOTMPDIR}/pld-${ARCH}.iso.dir.XXXXXX` || exit 1
+ MAINISODIR=`mktemp -d ${ISOTMPDIR}/pld-${ARCH}.iso.dir.XXXXXX` || exit 1
for NR in $(seq 1 ${COUNT}); do
@@ -96,21 +95,22 @@
ISODIR0=$MAINISODIR/1
mkdir -p ${ISODIR}/PLD || exit 1
if [ "${NR}" = "1" ]; then
- ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/coinst ${ISODIR}/PLD/coinst
- ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images ${ISODIR}/PLD/images
- ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst ${ISODIR}/PLD/inst
+ mkdir -p ${ISODIR}/PLD/images
+ cp -r ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/images/experimental/* ${ISODIR}/PLD/images
+ mkdir -p ${ISODIR}/PLD/inst/2.4.31-experimental
+ cp -r ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/inst/2.4.31-experimental ${ISODIR}/PLD/inst
case ${ARCH} in
i386|i586|i686)
ln -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/dosutils ${ISODIR}/PLD/dosutils
-# ln -s ${ROOT}/${DIST}/i386/PLD/BOOT ${ISODIR}/PLD/BOOT
+ ln -s ${ROOT}/${DIST}/i386/PLD/BOOT ${ISODIR}/PLD/BOOT
;;
esac
echo "cdrom_get = \"/usr/bin/vfjuggle %d %Pn\"" >${ISODIR0}/.poldekrc
echo "# priorites of packages used during generation of cd images" >${ISODIR0}/.pkgsplit.conf
- cat ${ROOT}/.stat/packages/poldek-iso.priority >>${ISODIR0}/.pkgsplit.conf
+ cat /home/users/pldftpac/admin/ftp/poldek-iso.priority >>${ISODIR0}/.pkgsplit.conf
# elif [ "${NR}" = "$COUNT" ]; then
# mkdir -p ${ISODIR}/test/
@@ -173,7 +173,7 @@
for NR in $(seq 1 ${COUNT}); do
ISODIR=$MAINISODIR/$NR
- ISONAME="pld-${ARCH}-test-${DATA}-CD${NR}"
+ ISONAME="pld-${ARCH}-${SUBVER}-CD${NR}"
if [ "${NR}" = "1" ]; then
BOOTOPT="-b ${BOOTDISK} -c PLD/images/boot.cat"
else
@@ -193,7 +193,7 @@
echo "Generating ls and md5sum for ${ISONAME}.iso"
cd ${ISOTARGET}/iso/${DIST}/${ARCH}
- ${ROOT}/.stat/bin/isoinfo -R -l -i ${ISONAME}.iso > ${ISONAME}.ls
+ /usr/bin/isoinfo -R -l -i ${ISONAME}.iso > ${ISONAME}.ls
md5sum ${ISONAME}.iso >> pld-${ARCH}-iso.md5
rm -rf ${ISODIR}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-mini?r1=1.20&r2=1.20.2.1&f=u
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15&r2=1.15.2.1&f=u
More information about the pld-cvs-commit
mailing list