diff options
| -rw-r--r-- | libre/cgminer-libre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/claws-mail-libre/PKGBUILD | 11 | ||||
| -rw-r--r-- | libre/mkisolinux/PKGBUILD | 13 | ||||
| -rwxr-xr-x | libre/mkisolinux/mkisolinux | 1 | ||||
| -rw-r--r-- | libre/mkisolinux/mkisolinux.conf | 2 | ||||
| -rw-r--r-- | libre/mksyslinux/PKGBUILD | 26 | ||||
| -rw-r--r-- | libre/mksyslinux/boot.msg | 15 | ||||
| -rwxr-xr-x | libre/mksyslinux/mksyslinux | 143 | ||||
| -rw-r--r-- | libre/mksyslinux/mksyslinux.conf | 34 | ||||
| -rw-r--r-- | libre/mksyslinux/options.msg | 6 |
10 files changed, 243 insertions, 18 deletions
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 575ea2d55..2db7dbbc5 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90344 2013-05-11 16:51:20Z fyan $ +# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.1.1 +pkgver=3.2.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -18,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=("https://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v$pkgver.tar.gz" +source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2" "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -34,7 +34,7 @@ build() { # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - ./autogen.sh + #./autogen.sh ./configure --prefix=/usr --enable-scrypt --disable-adl make @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -sha512sums=('f95db6ab14fe35ed19c1af152c6eb979787e966afad250252053bf11abe8293dfe857a7a2abfd9e33b60a190b310193a03151eb67a9db255a2a929660278ad62' +sha512sums=('e96b874fd53c771535098c1077200b5ab88aa628383f7af56f861c952a534283942ce34647f279bf4229bfc3a0114f81a7ae3deca4e8e7931d7551fdb75c68c0' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD index e37ffe283..2a0ce65ce 100644 --- a/libre/claws-mail-libre/PKGBUILD +++ b/libre/claws-mail-libre/PKGBUILD @@ -13,10 +13,11 @@ license=('GPL3') url="http://www.$_pkgname.org" depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1' 'libsm' 'db' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' +makedepends=('compface' 'spamassassin' 'bogofilter' # dependencies for plugins 'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases +[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind') optdepends=('python2: needed for some tools and python plugin' 'perl: needed for some tools and perl plugin' 'spamassassin: adds support for spamfiltering' @@ -50,7 +51,7 @@ build() { sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py sed -i 's:python -c:python2 -c:g' configure - setarch $CARCH ./configure --prefix=/usr --disable-static \ + ./configure --prefix=/usr --disable-static \ --enable-enchant \ --enable-gnutls \ --enable-ldap \ @@ -60,16 +61,16 @@ build() { --enable-bogofilter-plugin \ --enable-jpilot \ #--help - setarch $CARCH make + make } package() { cd $srcdir/$_pkgname-$pkgver - setarch $CARCH make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir install # build and install extra tools cd tools - setarch $CARCH make + make # all executables and .conf files ; only top directory find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD index 1c02bb01b..7c9ab6cc4 100644 --- a/libre/mkisolinux/PKGBUILD +++ b/libre/mkisolinux/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=mkisolinux -pkgver=2013.03 -pkgrel=2 +pkgver=2013.05 +pkgrel=1 pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" arch=(any) license=('GPL') @@ -12,10 +12,7 @@ depends=('mkinitcpio' 'cdrkit' 'syslinux' 'pciutils') replaces=('mkbootcd') backup=(etc/mkisolinux.conf) source=('boot.msg' 'mkisolinux' 'mkisolinux.conf' 'options.msg') -md5sums=('945d5f5d74f37718c8c9d518bfd5698d' - 'e28b82502ae44087852ea6bfac398d5c' - '456eba83dfba319f8132c89e7ba42ce5' - 'ae0007d6679b5a575b2a9e5ac3664baf') + package() { @@ -25,3 +22,7 @@ package() install -D -m644 boot.msg "$pkgdir/usr/share/mkisolinux/boot.msg" install -D -m644 options.msg "$pkgdir/usr/share/mkisolinux/options.msg" } +md5sums=('945d5f5d74f37718c8c9d518bfd5698d' + '384aac3786506ff96ec3d1147bcacfe5' + '3cc23d74d7e4378d1be431d68a71a173' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux index 0cb53e81e..ce1187d2a 100755 --- a/libre/mkisolinux/mkisolinux +++ b/libre/mkisolinux/mkisolinux @@ -65,7 +65,6 @@ install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux. 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 ..." diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf index 83d36219d..4af6f098c 100644 --- a/libre/mkisolinux/mkisolinux.conf +++ b/libre/mkisolinux/mkisolinux.conf @@ -2,7 +2,7 @@ # Rebranded for Parabola by André Silva <emulatorman@lavabit.com> # config file of mkisolinux -# DEFAULT kernel boot options like root=/dev/hda3 etc. +# 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="" diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD new file mode 100644 index 000000000..16d595f12 --- /dev/null +++ b/libre/mksyslinux/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $ +# Maintainer : Tobias Powalowski <tpowa@archlinux.org> + +pkgname=mksyslinux +pkgver=2013.05 +pkgrel=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' + 'd958575945e4ce8a9002bd056e2f14be' + '1f1e2d80e28b087e4103282bc5c44071' + 'ae0007d6679b5a575b2a9e5ac3664baf') diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg new file mode 100644 index 000000000..15476f2bd --- /dev/null +++ b/libre/mksyslinux/boot.msg @@ -0,0 +1,15 @@ + + +------------------------------------------------------------------------------ +Parabola GNU/Linux-libre +SYSLINUX BOOT +created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org> +rebranded for Parabola by André Silva <emulatorman@lavabit.com> + +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 <any_other_boot_option>' +Use the F2 key for troubleshooting and options. +------------------------------------------------------------------------------ + diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux new file mode 100755 index 000000000..4db771f83 --- /dev/null +++ b/libre/mksyslinux/mksyslinux @@ -0,0 +1,143 @@ +#! /bin/sh +# Created by Tobias Powalowski <tpowa@archlinux.org> +# 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=<yourimage> of=<yourdevice>' 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}/$BOOTDIRNAME +echo ":: Mounting ${DEVICE} ..." +if ! [ "${IMAGENAME}" = "" ]; then + modprobe loop +else + mount ${DEVICE} ${TEMPDIR} || exit 1 +fi +# 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}/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 -o 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 new file mode 100644 index 000000000..ab2d4978a --- /dev/null +++ b/libre/mksyslinux/mksyslinux.conf @@ -0,0 +1,34 @@ +# Created by Tobias Powalowski <tpowa@archlinux.org> +# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> +# 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 new file mode 100644 index 000000000..16c6b2eda --- /dev/null +++ b/libre/mksyslinux/options.msg @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +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. +------------------------------------------------------------------------------ |