Date: Thursday, August 26, 2010 @ 06:05:54 Author: tpowa Revision: 88920
upgpkg: mkisolinux 2010.08-1 change to /boot and /boot/syslinux and syslinux.cfg Modified: mkisolinux/trunk/PKGBUILD mkisolinux/trunk/mkisolinux mkisolinux/trunk/mkisolinux.conf -----------------+ PKGBUILD | 10 +++++----- mkisolinux | 43 ++++++++++++++++++++++++------------------- mkisolinux.conf | 4 ++-- 3 files changed, 31 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-08-26 10:02:46 UTC (rev 88919) +++ PKGBUILD 2010-08-26 10:05:54 UTC (rev 88920) @@ -2,13 +2,13 @@ # Maintainer : Tobias Powalowski <[email protected]> pkgname=mkisolinux -pkgver=2008.12 +pkgver=2010.08 pkgrel=1 pkgdesc="Advanced, modular isolinux bootcd image creation utility" -arch=(i686 x86_64) +arch=(any) license=('GPL') url="http://www.archlinux.org/"; -depends=('mkinitcpio' 'cdrkit' 'syslinux') +depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') replaces=('mkbootcd') backup=(etc/mkisolinux.conf) @@ -22,6 +22,6 @@ install -D -m644 options.msg $startdir/pkg/usr/share/mkisolinux/options.msg } md5sums=('6cc9a8927353479a5426b85c0ae1d826' - 'a0bb46d322ebeef38dae026008e3a19c' - '287af942432ca63e3902c2f0e166751d' + '4d25bcd129894fc91d515852eb35ba77' + '9461157f9bc113cfb25b7a5df48685ac' 'b211c5f7e30d2ee36cde20f71aa3f2b8') Modified: mkisolinux =================================================================== --- mkisolinux 2010-08-26 10:02:46 UTC (rev 88919) +++ mkisolinux 2010-08-26 10:05:54 UTC (rev 88920) @@ -50,7 +50,7 @@ [ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE export RUNPROGRAM="${APPNAME}" -export BOOTDIRNAME="isolinux" +export BOOTDIRNAME="boot/syslinux" [ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) [ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) @@ -59,33 +59,38 @@ # begin script mkdir -p ${TEMPDIR}/${BOOTDIRNAME}/ +# prepare syslinux install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin - -# create isolinux.cfg -echo ":: Creating isolinux.cfg ..." +for i in /usr/lib/syslinux/*.c32; do + install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) +done +install -m644 /lib/modules/$(uname -r)/modules.pcimap ${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap +install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids +# create syslinux.cfg +echo ":: Creating syslinux.cfg ..." if [ "${ISOLINUXCFG}" = "" ]; then - [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "default arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "label arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "default arch" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "label arch" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "kernel /boot/vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg + echo "append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg else sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ - ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg + ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg fi -[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1 +[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1 echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." # generate initramdisk echo ":: Creating initramdisk ..." - mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img + mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/boot/initrd.img echo ":: Using ${KERNEL} as image kernel ..." - install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz + install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 @@ -94,7 +99,7 @@ echo ":: Creating ISO image ..." [ -e ${GENIMG} ] && rm ${GENIMG} [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Arch Linux" - mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \ + mkisofs -RlDJLV "${ISONAME}" -b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 \ && echo ":: ISO Image succesfull created at ${GENIMG}" # burning/blanking image Modified: mkisolinux.conf =================================================================== --- mkisolinux.conf 2010-08-26 10:02:46 UTC (rev 88919) +++ mkisolinux.conf 2010-08-26 10:05:54 UTC (rev 88920) @@ -19,8 +19,8 @@ BOOTMESSAGE="/usr/share/mkisolinux/boot.msg" OPTIONSBOOTMESSAGE="/usr/share/mkisolinux/options.msg" -# isolinux.cfg file to use -ISOLINUXCFG="" +# syslinux.cfg file to use +SYSLINUXCFG="" # Prompt on boot, 1=yes 0=no PROMPT="1"
