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

8 files changed, 155 insertions, 191 deletions

diff --git a/libre/acpi_call-lts/PKGBUILD b/libre/acpi_call-lts/PKGBUILD
index 41656d495..eee7e7562 100644
--- a/libre/acpi_call-lts/PKGBUILD
+++ b/libre/acpi_call-lts/PKGBUILD
@@ -6,106 +6,64 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_kernelname=-lts
+_basekernel=4.9
+_archrel=53
+_parabolarel=2
 
-if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.14
-  _archrel=90
-  _parabolarel=1
-elif [[ ${_kernelname} == -lts ]]; then
-  _basekernel=4.9
-  _archrel=53
-  _parabolarel=1
-fi
-
-pkgbase=acpi_call
+pkgname=acpi_call-lts
 pkgver=1.1.0
 pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
-_extramodules=extramodules-${_basekernel}${_kernelname}
-pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)"
+_extramodules=extramodules-${_basekernel}-lts
+pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'armv7h')
-url="http://github.com/mkottman/${pkgbase}"
+url="http://github.com/mkottman/acpi_call"
 license=('GPL')
 
 # Generic (you shouldn't have to modify any of these variables)
 _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_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')
 
-if [[ ${_kernelname} != "" ]]; then
-  provides=("${pkgbase}")
-fi
+replaces=("${pkgname%-*}-libre-lts" "${pkgname%-*}-parabola-lts" "${pkgname}-parabola")
+conflicts=("${pkgname%-*}-libre-lts" "${pkgname%-*}-parabola-lts" "${pkgname}-parabola")
+provides=("acpi_call")
 
-source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz"
-        'dkms.conf')
-sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0'
-            '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a')
+install='kmod.install'
+source=("${pkgname%-*}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz")
+sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0')
 
 prepare() {
-  cd "${pkgbase}-${pkgver}"
-
-  if [[ ${_basekernel} > 3.16 ]]; then
-    # Fix build with Linux-libre 3.17-gnu
-    sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c
-  fi
+  cd "${pkgname%-*}-${pkgver}"
 
-  if [[ ${_basekernel} > 4.11 ]]; then
-    # Fix build with Linux-libre 4.12-gnu
-    sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c
-  fi
+  # Fix build with Linux-libre >= 3.17-gnu
+  sed -i 's|acpi/acpi.h|linux/acpi.h|' acpi_call.c
 }
 
 build() {
-  cd "${pkgbase}-${pkgver}"
-  make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)"
-}
-
-_package() {
-  depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-  replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
-  [[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola")
-  conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
-  [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola")
-
-  cd $pkgbase-$pkgver
+  cd "${pkgname%-*}-${pkgver}"
 
-  # Actually install
-  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko
-  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
 
-  echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call${_kernelname}.conf"
-
-  mkdir -p "$pkgdir/usr/share/acpi_call${_kernelname}"
-  cp -t "$pkgdir/usr/share/acpi_call${_kernelname}" -dr --no-preserve=ownership examples support
+  make KVERSION="${_kernver}"
 }
 
-if [[ ${_kernelname} == "" ]]; then
-  _package-dkms() {
-    depends=(dkms)
-    provides=("acpi_call=$pkgver-$pkgrel")
-    conflicts=(acpi_call)
-
-    cd $pkgbase-$pkgver
-
-    # Actually install
-    install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf
+package() {
+  cd "${pkgname%-*}-$pkgver"
 
-    echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.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}"
 
-    mkdir -p "$pkgdir/usr/share/acpi_call"
-    cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support
-  }
+  # Actually install  
+  install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d}
+  install -m 644 ${pkgname%-*}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}
+  gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgname%-*}.ko
+  echo ${pkgname%-*} > "${pkgdir}"/usr/lib/modules-load.d/${pkgname}.conf
 
-  pkgname=("${pkgbase}" "${pkgbase}-dkms")
-else
-  pkgname=("${pkgbase}${_kernelname}")
-fi
-
-for _p in ${pkgname[@]}; do
-  eval "package_${_p}() {
-    $(declare -f "_package${_p#${pkgbase}${_kernelname}}")
-    _package${_p#${pkgbase}${_kernelname}}
-  }"
-done
+  install -dm 755 "${pkgdir}"/usr/share/${pkgname}
+  cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${pkgname}/
+}
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/acpi_call-lts/dkms.conf b/libre/acpi_call-lts/dkms.conf
deleted file mode 100644
index edc5c2482..000000000
--- a/libre/acpi_call-lts/dkms.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-PACKAGE_NAME="acpi_call"
-PACKAGE_VERSION="#MODULE_VERSION#"
-AUTOINSTALL="yes"
-
-MAKE[0]="make KVERSION=$kernelver"
-CLEAN="make clean"
-
-BUILT_MODULE_NAME[0]="acpi_call"
-DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
diff --git a/libre/acpi_call-lts/kmod.install b/libre/acpi_call-lts/kmod.install
new file mode 100644
index 000000000..40caa464f
--- /dev/null
+++ b/libre/acpi_call-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
+}
diff --git a/libre/bbswitch-lts/PKGBUILD b/libre/bbswitch-lts/PKGBUILD
deleted file mode 100644
index 5d0473538..000000000
--- a/libre/bbswitch-lts/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor (Arch): M0Rf30
-# Contributor (Arch): Samsagax <samsagax@gmail.com>
-# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
-# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_kernelname=-lts
-
-if [[ ${_kernelname} == "" ]]; then
-  _basekernel=4.14
-  _archrel=96
-  _parabolarel=1
-elif [[ ${_kernelname} == -lts ]]; then
-  _basekernel=4.9
-  _archrel=38
-  _parabolarel=1
-fi
-
-pkgbase=bbswitch
-pkgver=0.8
-pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
-_extramodules=extramodules-${_basekernel}${_kernelname}
-pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre${_kernelname} kernel package)"
-arch=('i686' 'x86_64')
-url="http://github.com/Bumblebee-Project/${pkgbase}"
-license=('GPL')
-
-# Generic (you shouldn't have to modify any of these variables)
-_toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1)))
-makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-makedepends+=('libelf')
-
-if [[ ${_kernelname} != "" ]]; then
-  provides=("${pkgbase}")
-fi
-
-source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
-sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477')
-
-build() {
-  cd "${pkgbase}-${pkgver}"
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-  make KDIR=/lib/modules/${_kernver}/build
-}
-
-_package() {
-  depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}")
-  replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
-  conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}")
-
-  cd "${pkgbase}-${pkgver}"
-  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 bbswitch.ko
-  find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
-}
-
-if [[ ${_kernelname} == "" ]]; then
-  _package-dkms() {
-    depends=('dkms')
-    conflicts=('bbswitch')
-    provides=('bbswitch')
-
-    cd "${pkgbase}-${pkgver}"
-    install -Dt "${pkgdir}/usr/src/${pkgbase}-${pkgver}" -m644 Makefile bbswitch.c dkms/dkms.conf
-  }
-
-  pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms")
-else
-  pkgname=("${pkgbase}${_kernelname}")
-fi
-
-for _p in ${pkgname[@]}; do
-  eval "package_${_p}() {
-    $(declare -f "_package${_p#${pkgbase}${_kernelname}}")
-    _package${_p#${pkgbase}${_kernelname}}
-  }"
-done
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
+}
diff --git a/pcr/bbswitch-lts/PKGBUILD b/pcr/bbswitch-lts/PKGBUILD
new file mode 100644
index 000000000..6eba5cda0
--- /dev/null
+++ b/pcr/bbswitch-lts/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor (Arch): M0Rf30
+# Contributor (Arch): Samsagax <samsagax@gmail.com>
+# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info>
+# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_basekernel=4.9
+_archrel=38
+_parabolarel=2
+
+pkgname=bbswitch-lts
+_basename=bbswitch
+pkgver=0.8
+pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
+_extramodules=extramodules-${_basekernel}-lts
+pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre-lts kernel package)"
+arch=('i686' 'x86_64')
+url="http://github.com/Bumblebee-Project/${_basename}"
+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-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=("${_basename}-libre-lts" "${_basename}-parabola-lts")
+conflicts=("${_basename}-libre-lts" "${_basename}-parabola-lts")
+provides=("${_basename}")
+
+install='kmod.install'
+source=("${_basename}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
+sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477')
+
+build() {
+  cd "${srcdir}/${_basename}-${pkgver}"
+
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+
+  make KDIR=/lib/modules/${_kernver}/build
+}
+
+package() {
+  cd "${srcdir}/${_basename}-${pkgver}"
+
+  # 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}"
+
+  # Actually install
+  install -Dm644 ${_basename}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${_basename}.ko
+  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${_basename}.ko"
+}
diff --git a/pcr/bbswitch-lts/kmod.install b/pcr/bbswitch-lts/kmod.install
new file mode 100644
index 000000000..40caa464f
--- /dev/null
+++ b/pcr/bbswitch-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
+}