tp_smapi-parabola: fixing pkg

2 files changed, 25 insertions, 33 deletions

diff --git a/libre/tp_smapi-parabola/PKGBUILD b/libre/tp_smapi-parabola/PKGBUILD
index 8f73ab13f..6a395a0dd 100644
--- a/libre/tp_smapi-parabola/PKGBUILD
+++ b/libre/tp_smapi-parabola/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 116831 2014-08-04 07:32:08Z tpowa $
 # Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor (Arch): xduugu
 # Contributor (Arch): nh2
@@ -11,36 +10,31 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
-# Kernel info
 _basekernel=3.16
-_kernelname=
+_kernelname= # libre/linux-libre{,-lts}
 
-# Source info
 _pkgname=tp_smapi
+pkgname=${_pkgname}${_kernelname}-parabola
 pkgver=0.41
+pkgrel=52.2 # linux-libre=52.2 | linux-libre-lts=29.1
+_extramodules=extramodules-${_basekernel}${_kernelname}
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre${_kernelname} kernel package)"
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('63c683415c764568f6bf17c7eabe4752')
-
-# Package info
-pkgrel=52.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/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+md5sums=('63c683415c764568f6bf17c7eabe4752')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
@@ -54,15 +48,8 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
-  # 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}"
-
   # Actually install
   make -C "/usr/lib/modules/${_kernver}/build" \
     INSTALL_MOD_PATH="${pkgdir}/usr" \
@@ -77,5 +64,10 @@ package() {
 
   # load module on startup
   install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
-  echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
+  echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf"
+
+  # Set the correct extramodules directory for install
+  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  true && install=${install}.pkg
+  sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}"
 }
diff --git a/libre/tp_smapi-parabola/kmod.install b/libre/tp_smapi-parabola/kmod.install
index d4bd8cb34..40caa464f 100644
--- a/libre/tp_smapi-parabola/kmod.install
+++ b/libre/tp_smapi-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: