Author: arekm Date: Sat Oct 1 14:44:56 2005 GMT
Module: admin Tag: AC-branch
---- Log message:
- generate images for amd64 and ppc, too (using rescuecd, ppcrcd as boot isos)
---- Files affected:
admin/ftp:
geniso-poldek (1.15.2.1 -> 1.15.2.2)
---- Diffs:
================================================================
Index: admin/ftp/geniso-poldek
diff -u admin/ftp/geniso-poldek:1.15.2.1 admin/ftp/geniso-poldek:1.15.2.2
--- admin/ftp/geniso-poldek:1.15.2.1 Sat Oct 1 12:33:55 2005
+++ admin/ftp/geniso-poldek Sat Oct 1 16:44:50 2005
@@ -8,8 +8,7 @@
ROOT="/mnt/ftpcz"
PATH=$ROOT/.stat/bin:$PATH; export PATH
-#ARCHLIST="i386 i586 i686"
-ARCHLIST="i386 i586 i686 athlon"
+ARCHLIST="i386 i586 i686 athlon amd64 ppc"
#MKISOFSOPT="-print-size"
MKISOFSOPT="-quiet"
@@ -20,6 +19,7 @@
# $POLDEK
#POLDEK=$ROOT/.stat/bin/poldek-ra
POLDEK=/usr/bin/poldek
+POLDEK=$HOME/bin/poldek
#MKISOFS=$ROOT/.stat/bin/mkisofs
MKISOFS=/usr/bin/mkisofs
@@ -30,6 +30,10 @@
#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
@@ -37,17 +41,13 @@
NAME="Ac"
#TODAYS DATE
-DATA="20050616"
+DATA="20051001"
#VERSION="2.0"
VERSION="2.0"
#SUBVER="alpha-1"
-SUBVER="RC1"
-
-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
+SUBVER="RC1.1"
pld_info() {
echo "
@@ -71,15 +71,48 @@
echo -n "PLD ${VERSION} (${NAME}) ${SUBVER} ${DATA} "
}
+do_symlink() {
+ src="$1"
+ dst="$2"
+
+ if [ "$(echo $src/*)" != "$src/*" ]; then
+ for file in $src/*; do
+ ln -s "$file" "$dst"
+ done
+ fi
+ if [ "$(echo $src/.*)" != "$src/.*" ]; then
+ for file in $src/.*; do
+ ln -s "$file" "$dst"
+ done
+ fi
+}
# cd $ROOT/.stat/packages && cvs -d:pserver:[EMAIL PROTECTED]:/cvsroot up -A
poldek-iso.priority
for ARCH in ${ARCHLIST}; do
+
+ CDROM_SIZE=650
+ UTILS_SIZE=0
+ case "${ARCH}" in
+ i?86|amd64|x86_64)
+ UTILS_SIZE=$(du -scmD $ROOT/dists/${DIST}/PLD/i386/PLD/dosutils
| grep total | xargs | cut -d" " -f1)
+ UTILS_SIZE=$(($UTILS_SIZE + 10))
+ ;;
+ ppc)
+ MKISOFSOPT="$MKISOFSOPT -hfs"
+ ;;
+ esac
+
echo "Generating ISOs for ${ARCH}, size ${SIZE}"
rm -rf ${ISOTMPDIR}/pld-${ARCH}*iso*
- $POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --mkidxz
+# if ($POLDEK --version | grep -qE '0\.18\.'); 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
$POLDEK -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ --update
$POLDEK -vv -s ${ROOT}/dists/${DIST}/PLD/${ARCH}/PLD/RPMS/ \
--split=${CDROM_SIZE}:${UTILS_SIZE} \
@@ -95,15 +128,20 @@
ISODIR0=$MAINISODIR/1
mkdir -p ${ISODIR}/PLD || exit 1
if [ "${NR}" = "1" ]; then
- 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
+ i386)
+ ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
+ ;;
+ i586|i686|athlon)
+ ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
+ do_symlink ${ISOCD}/i486 ${ISODIR}/
+ ;;
+ amd64|x86_64)
+ ln -s ${ROOT}/dists/${DIST}/PLD/i386/PLD/dosutils
${ISODIR}/PLD/dosutils
+ do_symlink ${ISOCD}/amd64 ${ISODIR}/
+ ;;
+ ppc)
+ do_symlink ${ISOCD}/ppc ${ISODIR}/
;;
esac
@@ -127,11 +165,16 @@
done
# $POLDEK
- $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz
+ if ($POLDEK --version | grep -qE '0\.18\.'); then
+ $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz
+ else
+ $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pndir
+ $POLDEK -s ${ISODIR}/PLD/RPMS/ --mkidxz --mkidx-type pdir
+ fi
- # move indexes to first cd
+ # copy indexes to first cd
mkdir ${ISODIR0}/cd${NR} || exit 1
- mv ${ISODIR}/PLD/RPMS/packages.dir* ${ISODIR0}/cd${NR}
+ cp -a ${ISODIR}/PLD/RPMS/packages.*dir* ${ISODIR0}/cd${NR}
# create identification file
IDENT=${DIST}-cd${NR}
IDENT0=${DIST}-cd1
@@ -139,30 +182,6 @@
echo "source${NR} = cdrom://${IDENT0}/cd${NR}/" >>${ISODIR0}/.poldekrc
echo "prefix${NR} = cdrom://${IDENT}/PLD/RPMS/" >>${ISODIR0}/.poldekrc
- # apt
-# mkdir -p ${ISODIR}/apt/SRPMS.base
-# mkdir -p ${ISODIR}/apt/${DIST}/base
-# ln -s ../../PLD/RPMS ${ISODIR}/apt/${DIST}/RPMS.base
-
-# ${ROOT}/.stat/bin/genbasedir --bloat --topdir=${ISODIR}/apt/ ${DIST}/
base
- # wuch
- # ???
-
-# if [ "${NR}" = "$COUNT" ]; then
-# # $POLDEK
-# $POLDEK -s ${ISODIR}/test/${ARCH}/ --mkidxz
-# $POLDEK -s ${ISODIR}/supported/${ARCH}/ --mkidxz
-# # apt
-# mkdir -p ${ISODIR}/apt/SRPMS.supported
-# ln -s ../../supported/${ARCH}
${ISODIR}/apt/PLD-1.0/RPMS.supported
-# ${ROOT}/.stat/bin/genbasedir --bloat --topdir=${ISODIR}/apt/
PLD-1.0/ supported
-# mkdir -p ${ISODIR}/apt/SRPMS.test
-# ln -s ../../test/${ARCH}
${ISODIR}/apt/PLD-1.0/RPMS.test
-# ${ROOT}/.stat/bin/genbasedir --bloat --topdir=${ISODIR}/apt/
PLD-1.0/ test
-# # wuch
-# # ???
-# fi
-
pld_info > ${ISODIR}/PLD-README.txt
rel_info > ${ISODIR}/pld-version
echo "CD${NR} ${ARCH}" >> ${ISODIR}/pld-version
@@ -175,7 +194,15 @@
ISONAME="pld-${ARCH}-${SUBVER}-CD${NR}"
if [ "${NR}" = "1" ]; then
- BOOTOPT="-b ${BOOTDISK} -c PLD/images/boot.cat"
+ BOOTOPT=""
+ case "$ARCH" in
+ i?86|athlon|amd64|x86_64)
+ BOOTOPT="-no-emul-boot -boot-info-table -boot-load-size 4
-b boot/isolinux/isolinux.bin -c boot/isolinux/boot.catalog"
+ ;;
+ ppc)
+ BOOTOPT="-R -r -hfs -part -map ${ISOCD}/ppc/boot/hfs.map
-no-desktop -hfs-bless boot -chrp-boot"
+ ;;
+ esac
else
BOOTOPT=""
fi
@@ -189,7 +216,7 @@
${BOOTOPT} \
-J -r -f \
-o ${ISOTARGET}/iso/${DIST}/${ARCH}/${ISONAME}.iso \
- ${ISODIR}/ || rm -f ${ROOT}/iso/${DIST}/${ARCH}/${ISONAME}.iso
+ ${ISODIR}/ || rm -f ${ROOT}/iso/${DIST}/${ARCH}/${ISONAME}.iso ||
exit 1
echo "Generating ls and md5sum for ${ISONAME}.iso"
cd ${ISOTARGET}/iso/${DIST}/${ARCH}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/admin/ftp/geniso-poldek?r1=1.15.2.1&r2=1.15.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
