summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/bbswitch-libre/PKGBUILD2
-rw-r--r--libre/calibre-libre/PKGBUILD2
-rw-r--r--libre/cdfs-libre/PKGBUILD4
-rw-r--r--libre/cgminer-libre/PKGBUILD10
-rw-r--r--libre/grub/20_memtest86+29
-rw-r--r--libre/grub/60_memtest86+32
-rw-r--r--libre/grub/PKGBUILD34
-rw-r--r--libre/gummiboot/PKGBUILD4
-rw-r--r--libre/tp_smapi-libre/PKGBUILD4
-rw-r--r--libre/vhba-module-libre/60-vhba.rules14
-rw-r--r--libre/vhba-module-libre/PKGBUILD32
-rw-r--r--libre/vhba-module-libre/vhba-module.install3
12 files changed, 80 insertions, 90 deletions
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 2dc83cb5e..a00a75488 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
pkgname=bbswitch-libre
pkgver=0.7
_extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install
-pkgrel=1
+pkgrel=2
pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 6d97546ee..8a42d10c3 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -10,7 +10,7 @@
_pkgname=calibre
pkgname=calibre-libre
pkgver=0.9.35
-pkgrel=1
+pkgrel=1.1
pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
arch=('i686' 'x86_64' 'mips64el')
url="http://calibre-ebook.com/"
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 8ea0dbba7..00f097046 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91714 2013-05-26 15:39:48Z tpowa $
+# $Id: PKGBUILD 92742 2013-06-14 12:09:51Z tpowa $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ _pkgname=cdfs
pkgname=cdfs-libre
pkgver=2.6.27
_extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
-pkgrel=45
+pkgrel=46
pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
arch=(i686 x86_64 mips64el)
url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 00dcb7f7a..b9088a4ff 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92066 2013-05-31 05:55:37Z fyan $
+# $Id: PKGBUILD 92845 2013-06-17 02:16:42Z 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.2.1
+pkgver=3.2.2
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'
@@ -51,6 +51,6 @@ package() {
install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
}
-sha512sums=('2a311fd93aaf489849021e34de7cb7fb9343d7ff2d05edbdcf86a0346e616384e57d2367173d0a60916d1154b78f4a1a2a458b3047a96e81ee5b757274068a5e'
- '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
- '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
+md5sums=('bea9522b2b008ffe4eeb0c7156753899'
+ 'fe4a243fabe24608f5c05e40f0f118f6'
+ 'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/grub/20_memtest86+ b/libre/grub/20_memtest86+
deleted file mode 100644
index 1d3096f6b..000000000
--- a/libre/grub/20_memtest86+
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh -e
-########################################################
-# This script generates a memtest86+ entry on grub.cfg #
-# if memtest is installed on the system. #
-########################################################
-
-prefix="/usr"
-exec_prefix="${prefix}"
-
-datarootdir="/usr/share"
-datadir="${datarootdir}"
-
-. "${datadir}/grub/grub-mkconfig_lib"
-
-MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
-CLASS="--class memtest86 --class gnu --class tool"
-
-if [ -e $MEMTEST86_IMAGE ] && is_path_readable_by_grub $MEMTEST86_IMAGE; then
- # image exists, create menu entry
- echo "Found memtest86+ image: $MEMTEST86_IMAGE" >&2
- cat << EOF
-menuentry "Memory test (memtest86+)" $CLASS {
-EOF
- prepare_grub_to_access_device `${grub_probe} --target=device $MEMTEST86_IMAGE` | sed -e "s/^/ /"
- cat << EOF
- linux16 (\$root)`make_system_path_relative_to_its_root $MEMTEST86_IMAGE`
-}
-EOF
-fi
diff --git a/libre/grub/60_memtest86+ b/libre/grub/60_memtest86+
new file mode 100644
index 000000000..064922ef2
--- /dev/null
+++ b/libre/grub/60_memtest86+
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system. #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+ ## image exists, create menu entry
+ echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
+ _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+ _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+ cat << EOF
+if [ "${grub_platform}" == "pc" ]; then
+ menuentry "Memory Tester (memtest86+)" ${CLASS} {
+ search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+ linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+ }
+fi
+EOF
+fi
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 3969d713a..1d24d181e 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -9,11 +9,11 @@ _grub_915_ver=9
pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
pkgbase=grub
pkgver=2.00
-pkgrel=2
+pkgrel=4
url="https://www.gnu.org/software/grub/"
arch=('i686' 'x86_64')
license=('GPL3')
-makedepends=('xz' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
+makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
@@ -23,10 +23,21 @@ source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
'parabola_grub_mkconfig_fixes.patch'
'grub.default'
'grub.cfg'
- '20_memtest86+'
+ '60_memtest86+'
'grub_bzr_export.sh'
'0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
'grub-2.00-fix-docs.patch')
+md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
+ '704ea9f250b6137f05fa0197fd07053a'
+ '77f7d5f8ce395663cd7fff4d37099957'
+ 'a80e2b1d3bab778c3b6117d5a698992f'
+ 'c776aaf2cc35488a7c531b59e697470d'
+ '52d374e0194e3f2e39ff7c92ecd58a6c'
+ '255eafb440b8c285b20431366c2d2d27'
+ '9b6358d3de5c4bb95a041ab7c44a21ec'
+ 'f343ed2340ebc86c427873641bb72419'
+ 'ab751d1d8cd3fd47e5ee24d71ecc31ed'
+ '342dd18472a24e5fd252458b24f39a29')
noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
"grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
@@ -181,7 +192,9 @@ build() {
package_grub-common() {
pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)"
- depends=('sh' 'xz' 'freetype2' 'gettext' 'device-mapper' 'fuse')
+ depends=('sh' 'xz' 'gettext' 'device-mapper')
+ optdepends=('freetype2: for grub-mkfont usage'
+ 'fuse: for grub-mount usage')
conflicts=('grub-legacy' 'grub')
replaces=('grub2-common')
provides=('grub2-common')
@@ -197,7 +210,7 @@ package_grub-common() {
echo
## install extra /etc/grub.d/ files
- install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+"
+ install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
## install /etc/default/grub (used by grub-mkconfig)
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
@@ -253,14 +266,3 @@ package_grub-efi-i386() {
rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
}
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
- '704ea9f250b6137f05fa0197fd07053a'
- '77f7d5f8ce395663cd7fff4d37099957'
- 'a80e2b1d3bab778c3b6117d5a698992f'
- 'c776aaf2cc35488a7c531b59e697470d'
- '52d374e0194e3f2e39ff7c92ecd58a6c'
- '255eafb440b8c285b20431366c2d2d27'
- '9b6358d3de5c4bb95a041ab7c44a21ec'
- 'f343ed2340ebc86c427873641bb72419'
- 'ab751d1d8cd3fd47e5ee24d71ecc31ed'
- '342dd18472a24e5fd252458b24f39a29')
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index bbed77b21..156525eef 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187912 2013-06-08 06:38:24Z tpowa $
+# $Id: PKGBUILD 188624 2013-06-17 06:29:16Z tpowa $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -6,7 +6,7 @@
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
pkgname="gummiboot"
-pkgver="32"
+pkgver="33"
pkgrel="1"
pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
url="http://freedesktop.org/wiki/Software/gummiboot"
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 4dd77dda3..4a9a91be1 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91724 2013-05-26 15:41:39Z tpowa $
+# $Id: PKGBUILD 92750 2013-06-14 12:14:28Z tpowa $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -12,7 +12,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=22
+pkgrel=23
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/60-vhba.rules b/libre/vhba-module-libre/60-vhba.rules
index e4de1dca7..39ae3a4ec 100644
--- a/libre/vhba-module-libre/60-vhba.rules
+++ b/libre/vhba-module-libre/60-vhba.rules
@@ -1,13 +1 @@
-ACTION=="remove", GOTO="vhba_end"
-KERNEL!="vhba_ctl", GOTO="vhba_end"
-
-NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
-
-TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
-TAG+="udev-acl"
-GOTO="vhba_end"
-
-LABEL="vhba_uaccess"
-TAG+="uaccess"
-
-LABEL="vhba_end"
+ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess"
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index b1f8c6ffb..1016c0185 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91726 2013-05-26 15:41:55Z tpowa $
+# $Id: PKGBUILD 92752 2013-06-14 12:15:10Z tpowa $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -6,9 +6,9 @@
_pkgname=vhba-module
pkgname=vhba-module-libre
-pkgver=20120422
+pkgver=20130607
_extramodules=extramodules-3.9-LIBRE
-pkgrel=25
+pkgrel=2
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
@@ -22,28 +22,24 @@ conflicts=('vhba-module')
provides=("vhba-module=$pkgver")
source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
'60-vhba.rules')
-md5sums=('d97372da1d270d1605742b2995fb6678'
- 'b5e82d0160e7a181219b67c1794d5c27')
+md5sums=('92a681e4665aa85a8335d00395a61697'
+ '4dc37dc348b5a2c83585829bde790dcc')
build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
+ cd $_pkgname-$pkgver
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-
make KDIR=/usr/lib/modules/$_kernver/build
}
package() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- install -Dm644 vhba.ko \
- "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
-
- sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
- "$startdir/vhba-module.install"
-
- install -Dm644 "$srcdir/60-vhba.rules" \
- "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+ cd $_pkgname-$pkgver
+ install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
+ install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
+
+ cd $startdir
+ cp -f $install ${install}.pkg
+ true && install=${install}.pkg
+ sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index 88b96f7b4..793cffd8d 100644
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,7 @@
+EXTRAMODULES=
+
_updatemod() {
echo " > Updating module dependencies..."
- EXTRAMODULES='extramodules-3.9-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-27 08:15:11 +0000