diff options
author | Marco Neumann | 2016-11-11 22:56:55 +0100 |
---|---|---|
committer | Marco Neumann | 2016-11-11 22:56:55 +0100 |
commit | 9aaa0ed760a51c4996ebced2a3c9aa864050a60e (patch) | |
tree | c2ca1e3b391236888e2bda5ef2aa0317cb474bfe | |
parent | 5efaeb3476a40b6ce367a00cc236b7d22172e6d1 (diff) | |
download | aur-9aaa0ed760a51c4996ebced2a3c9aa864050a60e.tar.gz |
Update to pacman hooks, better install
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | blacklist-sixfireusb-dkms.conf | 1 | ||||
-rw-r--r-- | dkms.conf | 3 | ||||
-rw-r--r-- | sixfireusb.install | 19 |
5 files changed, 21 insertions, 29 deletions
@@ -1,11 +1,10 @@ # Generated by mksrcinfo v8 -# Sun May 22 19:35:34 UTC 2016 +# Fri Nov 11 21:56:05 UTC 2016 pkgbase = sixfireusb-dkms pkgdesc = Kernel modules for the Terratec DMX6FireUSB soundcard, including firmware pkgver = 0.6.2 - pkgrel = 2 + pkgrel = 6 url = http://sourceforge.net/projects/sixfireusb - install = sixfireusb.install arch = i686 arch = x86_64 license = GPL @@ -17,10 +16,12 @@ pkgbase = sixfireusb-dkms source = http://sourceforge.net/projects/sixfireusb/files/tools/fwinst.sh source = fwinst.patch source = dkms.conf + source = blacklist-sixfireusb-dkms.conf sha512sums = e79e4a62762626d966fa8c169b8666a0cfa3af8516e6f8a97e1a1d211d1deb1ed26bd2c5c8a4b563e03718c232e832686be783abbb66e5b49c8cc31858752068 sha512sums = 2cf369af6f8628796cbc47732335c2c00de8454f20ef06014bf11ba967dd791b3074c85f171964a77a72dd835917f84a85e073ca7194cfdd3a86e841efac0005 sha512sums = f4c6765a93475c48a5865179bfaaa29dddd5f942a8219a51662a16f454c03e99fad4a2b1d3f567cd7d2dd3d8c061d42b0b30a3850feffaadcc9ac276f025a797 - sha512sums = 43880b03da504b390471084e140e3b119080621792a9aad41e92e7372fb56fe88321289419f04ce33687955d45dfff049d3ba9b2df5eefee3d061ecb597372d8 + sha512sums = e15302d1b589296ddc234f1836438bdfc0b864d1a6f2cf808d99dc5ed8f82b3fcdf7a097128af1f4f2e90258c9c0f9098b6d73698147ca830e08acdec64d85fb + sha512sums = 154150d5f6959c174a883504464e15e0c728ed71fa7f18ee3e75fa6e6810b7cdb87fae4a9df50587f7324943b5027096f9ef6b98e33bdcf147039fca1049dbd5 pkgname = sixfireusb-dkms @@ -3,7 +3,7 @@ pkgname=sixfireusb-dkms pkgver=0.6.2 -pkgrel=2 +pkgrel=6 pkgdesc="Kernel modules for the Terratec DMX6FireUSB soundcard, including firmware" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/sixfireusb" @@ -18,14 +18,15 @@ source=(http://sourceforge.net/projects/sixfireusb/files/sixfireusb-$pkgver.tar. http://sourceforge.net/projects/sixfireusb/files/tools/fwinst.sh fwinst.patch dkms.conf + blacklist-sixfireusb-dkms.conf ) sha512sums=( 'e79e4a62762626d966fa8c169b8666a0cfa3af8516e6f8a97e1a1d211d1deb1ed26bd2c5c8a4b563e03718c232e832686be783abbb66e5b49c8cc31858752068' '2cf369af6f8628796cbc47732335c2c00de8454f20ef06014bf11ba967dd791b3074c85f171964a77a72dd835917f84a85e073ca7194cfdd3a86e841efac0005' 'f4c6765a93475c48a5865179bfaaa29dddd5f942a8219a51662a16f454c03e99fad4a2b1d3f567cd7d2dd3d8c061d42b0b30a3850feffaadcc9ac276f025a797' - '43880b03da504b390471084e140e3b119080621792a9aad41e92e7372fb56fe88321289419f04ce33687955d45dfff049d3ba9b2df5eefee3d061ecb597372d8' + 'e15302d1b589296ddc234f1836438bdfc0b864d1a6f2cf808d99dc5ed8f82b3fcdf7a097128af1f4f2e90258c9c0f9098b6d73698147ca830e08acdec64d85fb' + '154150d5f6959c174a883504464e15e0c728ed71fa7f18ee3e75fa6e6810b7cdb87fae4a9df50587f7324943b5027096f9ef6b98e33bdcf147039fca1049dbd5' ) -install=sixfireusb.install build() { patch -Np1 -i fwinst.patch -o fwinst-patched.sh --follow-symlink @@ -39,9 +40,16 @@ package() { sh ./fwinst-patched.sh ${pkgdir} install -dm755 "${pkgdir}/usr/src/sixfireusb-${pkgver}" + for f in `find sixfireusb-${pkgver} -type f` + do + f2=`basename ${f}` + install -m644 ${srcdir}/sixfireusb-${pkgver}/${f2} "${pkgdir}/usr/src/sixfireusb-${pkgver}/${f2}" + done - cp -r ${srcdir}/sixfireusb-${pkgver}/* "${pkgdir}/usr/src/sixfireusb-${pkgver}/" - cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/sixfireusb-${pkgver}/dkms.conf" + install -m644 ${srcdir}/dkms.conf "${pkgdir}/usr/src/sixfireusb-${pkgver}/dkms.conf" sed -i -e "s/@VERSION@/${pkgver}/" "${pkgdir}/usr/src/sixfireusb-${pkgver}/dkms.conf" + + install -dm755 "$pkgdir/etc/modprobe.d" + install -m644 "$srcdir/blacklist-sixfireusb-dkms.conf" "$pkgdir/etc/modprobe.d" } diff --git a/blacklist-sixfireusb-dkms.conf b/blacklist-sixfireusb-dkms.conf new file mode 100644 index 000000000000..80c806ae2b89 --- /dev/null +++ b/blacklist-sixfireusb-dkms.conf @@ -0,0 +1 @@ +blacklist snd_usb_6fire diff --git a/dkms.conf b/dkms.conf index 8c2488752e64..11042954334e 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,5 +1,6 @@ PACKAGE_NAME="sixfireusb" PACKAGE_VERSION="@VERSION@" BUILT_MODULE_NAME[0]="snd-usb-6fire" -DEST_MODULE_LOCATION[0]="/extramodules" +DEST_MODULE_NAME[0]="snd-usb-6fire-dkms" +DEST_MODULE_LOCATION[0]="/kernel/sound/usb/6fire" AUTOINSTALL="yes" diff --git a/sixfireusb.install b/sixfireusb.install deleted file mode 100644 index ccd692eabf80..000000000000 --- a/sixfireusb.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - dkms install -m sixfireusb -v ${1%%-*} -} - -pre_upgrade() { - local curver=${2%%-*} - # $2 is unset due to a bug. See, https://bugs.archlinux.org/task/32278 - # Query current version using pacman as fallback - [ -n "$curver" ] || curver=$(pacman -Q sixfireusb-dkms | cut -d' ' -f2) - pre_remove $curver -} - -post_upgrade() { - post_install ${1%%-*} -} - -pre_remove() { - dkms remove -m sixfireusb -v ${1%%-*} --all -} |