linux-mainline 5.0

4 files changed, 29 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0370ac88f80..2ea05bd07aef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,14 @@
-# Generated by mksrcinfo v8
-# Mon Jan 23 13:17:13 UTC 2017
-pkgbase = bbswitch-mainline
-	pkgdesc = Kernel module allowing to switch dedicated graphics card on Optimus laptops for linux-mainline
+pkgbase = bbswitch
+	pkgdesc = Kernel module allowing to switch dedicated graphics card on Optimus laptops
 	pkgver = 0.8
-	pkgrel = 11
-	url = https://github.com/Bumblebee-Project/bbswitch
-	install = bbswitch-mainline.install
-	arch = i686
+	pkgrel = 1
+	url = http://github.com/Bumblebee-Project/bbswitch
 	arch = x86_64
 	license = GPL
-	makedepends = linux-mainline-headers>=4.10rc1
-	makedepends = linux-mainline-headers<4.11
-	depends = linux-mainline>=4.10rc1
-	depends = linux-mainline<4.11
-	provides = bbswitch
-	source = v0.8.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz
-	sha256sums = 76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477
+	makedepends = linux-mainline-headers>=5.0rc1-1
+	depends = linux-mainline>=5.0rc1-1
+	source = bbswitch-0.8.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz
+	md5sums = 5b116b31ace3604ddf9d1fc1f4bc5807
 
 pkgname = bbswitch-mainline
 
diff --git a/.gitignore b/.gitignore
index 870f09a18166..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *
-!bbswitch-mainline.install
 !PKGBUILD
 !.SRCINFO
 !.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index b635680f56bc..c95e190e35a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,30 @@
-# Maintainer: FadeMind <fademind@gmail.com>
+# Maintainer: Clarke <mrlusberg@gmail.com>
+# Contributor: FadeMind <fademind@gmail.com>
 # Contributor: Boyan Ding <stu_dby@126.com>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 
-_pkgname=bbswitch
-_extramodules=extramodules-4.10-mainline
-
-pkgname=bbswitch-mainline
+pkgbase=bbswitch
+pkgname=(bbswitch-mainline)
 pkgver=0.8
-pkgrel=11
-pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops for linux-mainline"
-arch=('i686' 'x86_64')
-url="https://github.com/Bumblebee-Project/${_pkgname}"
+pkgrel=1
+pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops"
+arch=('x86_64')
+url="http://github.com/Bumblebee-Project/bbswitch"
 license=('GPL')
-depends=('linux-mainline>=4.10rc1' 'linux-mainline<4.11')
-makedepends=('linux-mainline-headers>=4.10rc1' 'linux-mainline-headers<4.11')
-provides=(${_pkgname})
-install=${pkgname}.install
-source=("v${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477')
+depends=('linux-mainline>=5.0rc1-1')
+makedepends=('linux-mainline-headers>=5.0rc1-1')
+_extramodules=extramodules-mainline
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
+md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
 
 build() {
-    _kernver=$(cat /usr/lib/modules/${_extramodules}/version)
-
-    cd ${_pkgname}-${pkgver}
-    make KDIR=/lib/modules/${_kernver}/build
+  cd ${pkgbase}-${pkgver}
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  make KDIR=/lib/modules/${_kernver}/build
 }
 
-package() {
-    install -Dm644 "${_pkgname}-${pkgver}/${_pkgname}.ko" "${pkgdir}/usr/lib/modules/${_extramodules}/${_pkgname}.ko"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${_pkgname}.ko"
-    sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" ${startdir}/*.install
+package_bbswitch-mainline() {
+  cd ${pkgbase}-${pkgver}
+  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 *.ko
+  find "${pkgdir}" -name '*.ko' -exec xz {} +
 }
diff --git a/bbswitch-mainline.install b/bbswitch-mainline.install
deleted file mode 100644
index cbc919385f3a..000000000000
--- a/bbswitch-mainline.install
+++ /dev/null
@@ -1,13 +0,0 @@
-EXTRAMODULES=extramodules-4.10-mainline
-
-post_install() {
-  depmod -v $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_upgrade() {
-  depmod -v $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}
-
-post_remove() {
-  depmod -v $(cat /usr/lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
-}