From 224ff53c78c2e8df8c6ac3f5b84964a9fd228ee3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 26 Aug 2014 07:04:44 -0300 Subject: add parabola suffix on some packages --- libre/mksyslinux/PKGBUILD | 26 ------- libre/mksyslinux/boot.msg | 15 ---- libre/mksyslinux/mksyslinux | 144 --------------------------------------- libre/mksyslinux/mksyslinux.conf | 34 --------- libre/mksyslinux/options.msg | 6 -- 5 files changed, 225 deletions(-) delete mode 100644 libre/mksyslinux/PKGBUILD delete mode 100644 libre/mksyslinux/boot.msg delete mode 100755 libre/mksyslinux/mksyslinux delete mode 100644 libre/mksyslinux/mksyslinux.conf delete mode 100644 libre/mksyslinux/options.msg (limited to 'libre/mksyslinux') diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD deleted file mode 100644 index 4628c66e6..000000000 --- a/libre/mksyslinux/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $ -# Maintainer (Arch): Tobias Powalowski - -pkgname=mksyslinux -pkgver=2013.06 -pkgrel=1.1 -pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)" -arch=(any) -license=('GPL') -url="https://parabolagnulinux.org/" -depends=('mkinitcpio' 'syslinux' 'pciutils') -backup=(etc/mksyslinux.conf) -source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg') - -package() -{ - cd "$srcdir/" - install -D -m755 mksyslinux "$pkgdir/usr/bin/mksyslinux" - install -D -m644 mksyslinux.conf "$pkgdir/etc/mksyslinux.conf" - install -D -m644 boot.msg "$pkgdir/usr/share/mksyslinux/boot.msg" - install -D -m644 options.msg "$pkgdir/usr/share/mksyslinux/options.msg" -} -md5sums=('287aad9693ca8061495e248c41ba43a7' - '0a9fd93356b5d98ab386f28bc849b808' - '15742e47e40a46491694b4b7680d4e38' - 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg deleted file mode 100644 index 2cfe24d42..000000000 --- a/libre/mksyslinux/boot.msg +++ /dev/null @@ -1,15 +0,0 @@ - - ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre -SYSLINUX BOOT -created with 'mksyslinux' by Tobias Powalowski -rebranded for Parabola by André Silva - -Press ENTER or type 'parabola' to boot image. - -If you wish to change your defaults to boot into your existing system, -type 'vmlinuz initrd=initrd.img ' -Use the F2 key for troubleshooting and options. ------------------------------------------------------------------------------- - diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux deleted file mode 100755 index 96ad45133..000000000 --- a/libre/mksyslinux/mksyslinux +++ /dev/null @@ -1,144 +0,0 @@ -#! /bin/sh -# Created by Tobias Powalowski -# Settings -APPNAME=$(basename "${0}") -CONFIG="/etc/mksyslinux.conf" -export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX) -TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX) -BOOTDIRNAME=boot/syslinux - -usage () -{ - echo "${APPNAME}: usage" - echo "WRITING TO DEVICE:" - echo "- PREPARATION: Your device must have a bootable first partition in FAT16 format!" - echo "- ATTENTION: The MBR of your DEVICE will be overwritten! You have been warned!" - echo "" - echo "CREATING AN IMAGE FILE:" - echo "- For creating an image file use the -i=IMAGEFILE switch" - echo "- use 'dd if= of=' to write to your device afterwards." - echo "" - echo "PARAMETERS:" - echo " -d=DEVICE Your DEVICE first partition from /dev/xxx tree to install" - echo " -i=IMAGENAME Your IMAGENAME" - echo " -c=CONFIG Use CONFIG file. default: /etc/mksyslinux.conf" - echo " -h This message." - exit 1 -} - -[ "$1" == "" ] && usage && exit 1 - - -while [ $# -gt 0 ]; do - case $1 in - -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; - -d=*|--d=*) DEVICE="$(echo $1 | awk -F= '{print $2;}')" ;; - -i=*|--i=*) IMAGENAME="$(echo $1 | awk -F= '{print $2;}')" ;; - -h|--h|?) usage ;; - *) usage ;; - esac - shift -done - -if [ ! -f "${CONFIG}" ]; then - echo "config file '${CONFIG}' cannot be found, aborting..." - exit 1 -fi - -if [ "${IMAGENAME}" = "" ]; then - if [ "${DEVICE}" = "" ]; then - echo "ERROR: No DEVICE name specified, please use the -d option" - exit 1 - fi -fi - -if ! [ $UID -eq 0 ]; then - echo "ERROR: only works when run as root!" - exit 1 -fi - -. "${CONFIG}" -# export for mkinitcpio -[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE -[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX -[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE - -MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')" - -export RUNPROGRAM="${APPNAME}" -[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) -[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) -export USEKERNEL=${VERSION} -# begin script -[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} -mkdir -p ${TEMPDIR} -echo ":: Mounting ${DEVICE} ..." -if ! [ "${IMAGENAME}" = "" ]; then - modprobe loop -else - mount ${DEVICE} ${TEMPDIR} || exit 1 -fi -mkdir -p ${TEMPDIR}/${BOOTDIRNAME} -# prepare syslinux bootloader -install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin -for i in /usr/lib/syslinux/*.c32; do - install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i) -done -install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids - -# create syslinux.cfg -echo ":: Creating syslinux.cfg ..." -if [ "${SYSLINUXCFG}" = "" ]; then - [ -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 parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg - echo "label parabola" >> ${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" \ - ${SYSLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg -fi -[ ! -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}/boot/initrd.img -echo ":: Using ${KERNEL} as image kernel ..." - 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 - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 -if ! [ "${IMAGENAME}" = "" ]; then - # ext2 overhead's upper bound is 6% - # empirically tested up to 1GB - rootsize=$(du -bs ${TEMPDIR}|cut -f1) - IMGSZ=$(( (${rootsize}*106)/100/512 + 1)) # image size in sectors - # create the filesystem image file - dd if=/dev/zero of="${IMAGENAME}" bs=512 count="${IMGSZ}" - # create a filesystem on the image - mkfs.vfat "${IMAGENAME}" - mount -o loop ${IMAGENAME} ${TMPDIR} || exit 1 - cp -r "${TEMPDIR}"/* "$TMPDIR" - umount ${TMPDIR} -else - echo ":: Unmounting ${DEVICE} ..." - umount ${TEMPDIR} || exit 1 -fi -if ! [ "${IMAGENAME}" = "" ]; then - echo ":: Installing SYSLINUX on ${IMAGENAME} ..." - syslinux ${IMAGENAME} && echo "Installation completed." -else - echo ":: Installing MBR on ${MBRDEVICE} ..." - cat ${MBR} > ${MBRDEVICE} - echo ":: Installing SYSLINUX on ${DEVICE} ..." - syslinux -t offset ${DEVICE} && echo "Installation completed." -fi -# clean /tmp -rm -r ${TEMPDIR} -! [ ${IMAGENAME} = "" ] && rm -r ${TMPDIR} diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf deleted file mode 100644 index a7d032295..000000000 --- a/libre/mksyslinux/mksyslinux.conf +++ /dev/null @@ -1,34 +0,0 @@ -# Created by Tobias Powalowski -# Rebranded for Parabola by André Silva -# config file of mksyslinux - -# DEFAULT kernel boot options like root=/dev/sda3 etc. -# add your root= option, if you boot from a disk device -# and don't want to add it by hand on each boot -KERNEL_BOOT_OPTIONS="" - -# mkinitcpio config file, defaulted to stock config file -MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" - -# kernel version, defaulted to build for runtime kernel -VERSION="$(uname -r)" - -# kernel image, defaulted to stock libre kernel -KERNEL="/boot/vmlinuz-linux-libre" - -# boot message files -BOOTMESSAGE="/usr/share/mksyslinux/boot.msg" -OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg" - -# syslinux.cfg file to use -SYSLINUXCFG="" - -# Prompt on boot, 1=yes 0=no -PROMPT="1" - -# Timeout, 30 seconds to fix usb keyboard issues -# 0 means wait for prompt -TIMEOUT="300" - -# default MBR -MBR="/usr/lib/syslinux/mbr.bin" diff --git a/libre/mksyslinux/options.msg b/libre/mksyslinux/options.msg deleted file mode 100644 index 16c6b2eda..000000000 --- a/libre/mksyslinux/options.msg +++ /dev/null @@ -1,6 +0,0 @@ ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre options and troubleshooting: - -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp nomsi may be useful. ------------------------------------------------------------------------------- -- cgit v1.2.3-54-g00ecf