rebuild module packages against linux-libre-lts-4.9.75_gnu-1

2 files changed, 36 insertions, 27 deletions

diff --git a/libre/tp_smapi-lts/PKGBUILD b/libre/tp_smapi-lts/PKGBUILD
index 8a752b925..00522f0b3 100644
--- a/libre/tp_smapi-lts/PKGBUILD
+++ b/libre/tp_smapi-lts/PKGBUILD
@@ -11,46 +11,36 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_kernelname=-lts
+_basekernel=4.9
+_archrel=24
+_parabolarel=2
 
-if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.14
-  _archrel=45
-  _parabolarel=1
-elif [[ ${_kernelname} == -lts ]]; then
-  _basekernel=4.9
-  _archrel=24
-  _parabolarel=1
-fi
-
-__pkgname=tp-smapi
-_pkgname=tp_smapi
-pkgname=${_pkgname}${_kernelname}
+pkgname=tp_smapi-lts
+_pkgname=tp-smapi
 pkgver=0.42
 pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
-_extramodules=extramodules-${_basekernel}${_kernelname}
-pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre${_kernelname} kernel package)"
+_extramodules=extramodules-${_basekernel}-lts
+pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}")
+depends=("linux-libre-lts>=${_basekernel}" "linux-libre-lts<${_toohigh}")
+makedepends=("linux-libre-lts-headers>=${_basekernel}" "linux-libre-lts-headers<${_toohigh}" "linux-libre-lts>=${_basekernel}" "linux-libre-lts<${_toohigh}")
 makedepends+=('libelf')
 
-replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}")
-if [[ ${_kernelname} != "" ]]; then
-  provides=("${_pkgname}")
-fi
+replaces=("${pkgname/-lts/}-libre-lts" "${pkgname/-lts/}-parabola-lts")
+conflicts=("${pkgname/-lts/}-libre-lts" "${pkgname/-lts/}-parabola-lts")
+provides=("${pkgname/-lts/}")
 
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${_pkgname}/archive/${__pkgname}/${pkgver}.tar.gz")
+install='kmod.install'
+source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${pkgname/-lts/}/archive/${_pkgname}/${pkgver}.tar.gz")
 sha256sums=('cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381')
 
 build() {
-  cd "${_pkgname}-${__pkgname}-${pkgver}"
+  cd "${pkgname/-lts/}-${_pkgname}-${pkgver}"
 
   # https://bugs.archlinux.org/task/54975 (kernel has no _GLOBAL_OFFSET_TABLE_):
   # Clear EXTRA_CFLAGS since it defaults to injecting CFLAGS and -fno-plt breaks the modules
@@ -59,7 +49,7 @@ build() {
 }
 
 package() {
-  cd "${_pkgname}-${__pkgname}-${pkgver}"
+  cd "${pkgname/-lts/}-${_pkgname}-${pkgver}"
 
   # install kernel modules
   find . -name "*.ko" -exec install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" {} +
@@ -69,5 +59,10 @@ package() {
 
   # load module on startup
   install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
-  echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf"
+  echo tp_smapi > "${pkgdir}/usr/lib/modules-load.d/${pkgname}.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-lts/kmod.install b/libre/tp_smapi-lts/kmod.install
new file mode 100644
index 000000000..40caa464f
--- /dev/null
+++ b/libre/tp_smapi-lts/kmod.install
@@ -0,0 +1,14 @@
+_EXTRAMODULES=
+
+post_install() {
+	echo ">>> Updating module dependencies. Please wait ..."
+	depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}