Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

2 files changed, 19 insertions, 24 deletions

diff --git a/libre/bbswitch-parabola/PKGBUILD b/libre/bbswitch-parabola/PKGBUILD
index 1b0dc8bd6..209f58cec 100644
--- a/libre/bbswitch-parabola/PKGBUILD
+++ b/libre/bbswitch-parabola/PKGBUILD
@@ -6,36 +6,31 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-# Kernel info
 _basekernel=3.16
 _kernelname=
 
-# Source info
 _pkgname=bbswitch
+pkgname=${_pkgname}-parabola${_kernelname}
 pkgver=0.8
+_extramodules=extramodules-${_basekernel}${_kernelname}
+pkgrel=15.1
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre${_kernelname} kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/Bumblebee-Project/bbswitch"
 license=('GPL')
-source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
-md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
-
-# Package info
-pkgrel=15.1
-arch=('i686' 'x86_64' 'mips64el')
-install='kmod.install'
 
 # Generic (you shouldn't have to modify any of these variables)
-pkgname=${_pkgname}-parabola${_kernelname}
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-_extramodules=extramodules-${_basekernel}${_kernelname}
 depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
 makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
-replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}") # for Arch-compatibility
-provides=("${_pkgname}${_kernelname}=${pkgver}") # for Arch-compatibility
-if [[ -n "${_kernelname}" ]]; then
-  provides+=("${_pkgname}-parabola=${pkgver}") # pkgname without _kernelname
-fi
+
+replaces=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+conflicts=("${_pkgname}${_kernelname}" "${_pkgname}-libre${_kernelname}")
+provides=("${_pkgname}${_kernelname}=${pkgver}")
+
+install='kmod.install'
+source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
+md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -51,7 +46,7 @@ package() {
   # Set the correct extramodules directory for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
   true && install=${install}.pkg
-  sed -r "s/(_extramodules=).*/\1${_extramodules}/" -i "${startdir}/${install}"
+  sed -i "s/^_EXTRAMODULES=$/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 
   # Actually install
   install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko
diff --git a/libre/bbswitch-parabola/kmod.install b/libre/bbswitch-parabola/kmod.install
index d4bd8cb34..40caa464f 100644
--- a/libre/bbswitch-parabola/kmod.install
+++ b/libre/bbswitch-parabola/kmod.install
@@ -1,14 +1,14 @@
+_EXTRAMODULES=
+
 post_install() {
-  _extramodules=THIS_IS_AUTOMATICALLY_SET_BY_PKGBUILD
-  depmod $(cat /usr/lib/modules/${_extramodules}/version)
+	echo ">>> Updating module dependencies. Please wait ..."
+	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
 post_remove() {
-  post_install
+	post_install
 }
-
-# vim: ts=2 sw=2 et: