[arch-commits] Commit in bbswitch/trunk (PKGBUILD bbswitch.install)

[Jan Steffens]

    Date: Saturday, November 18, 2017 @ 23:19:24
  Author: heftig
Revision: 267370

0.8-84

Modified:
  bbswitch/trunk/PKGBUILD
Deleted:
  bbswitch/trunk/bbswitch.install

------------------+
 PKGBUILD         |   30 +++++++++++-------------------
 bbswitch.install |   12 ------------
 2 files changed, 11 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-18 23:18:42 UTC (rev 267369)
+++ PKGBUILD	2017-11-18 23:19:24 UTC (rev 267370)
@@ -6,32 +6,27 @@
 pkgbase=bbswitch
 pkgname=(bbswitch bbswitch-dkms)
 pkgver=0.8
-_extramodules=extramodules-4.13-ARCH # Don't forget to update bbswitch.install
-pkgrel=83
+pkgrel=84
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops"
 arch=('x86_64')
 url="http://github.com/Bumblebee-Project/bbswitch"
 license=('GPL')
-makedepends=('linux-headers>=4.13' 'linux-headers<4.14' 'linux>=4.13' 'linux<4.14')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
+depends=('linux>=4.14' 'linux<4.15')
+makedepends=('linux-headers>=4.14' 'linux-headers<4.15')
+_extramodules=extramodules-4.14-ARCH
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
 md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
 
 build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
+  cd ${pkgbase}-${pkgver}
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
   make KDIR=/lib/modules/${_kernver}/build
 }
 
 package_bbswitch() {
-  depends=('linux>=4.13' 'linux<4.14')
-  install=bbswitch.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko"
+  cd ${pkgbase}-${pkgver}
+  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 bbswitch.ko
+  find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
 }
 
 package_bbswitch-dkms() {
@@ -39,9 +34,6 @@
   conflicts=('bbswitch')
   provides=('bbswitch')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  install -dm755 "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
-
-  install -Dm644 Makefile bbswitch.c dkms/dkms.conf "${pkgdir}/usr/src/${pkgbase}-${pkgver}/"
+  cd ${pkgbase}-${pkgver}
+  install -Dt "${pkgdir}/usr/src/${pkgbase}-${pkgver}" -m644 Makefile bbswitch.c dkms/dkms.conf
 }

Deleted: bbswitch.install
===================================================================
--- bbswitch.install	2017-11-18 23:18:42 UTC (rev 267369)
+++ bbswitch.install	2017-11-18 23:19:24 UTC (rev 267370)
@@ -1,12 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-4.13-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}