4 files changed, 31 insertions, 26 deletions
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 8d566c12b..caf835ce6 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -6,9 +6,9 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_basekernel=4.14
-_archrel=90
-_parabolarel=2
+_basekernel=4.15
+_archrel=103
+_parabolarel=1
 
 pkgbase=acpi_call
 pkgname=(acpi_call acpi_call-dkms)
@@ -51,8 +51,8 @@ package_acpi_call() {
   conflicts=("${pkgbase}-libre" "${pkgbase}-parabola")
 
   cd $pkgbase-$pkgver
-  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko
-  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *.ko
+  find "$pkgdir" -name '*.ko' -exec xz {} +
 
   echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf"
 
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index 5763d7fc9..f83e361c9 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -6,9 +6,9 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_basekernel=4.14
-_archrel=96
-_parabolarel=2
+_basekernel=4.15
+_archrel=109
+_parabolarel=1
 
 pkgbase=bbswitch
 pkgname=(bbswitch bbswitch-dkms)
@@ -40,8 +40,8 @@ package_bbswitch() {
   conflicts=("${pkgbase}-libre" "${pkgbase}-parabola")
 
   cd "${pkgbase}-${pkgver}"
-  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 bbswitch.ko
-  find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
+  install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 *.ko
+  find "${pkgdir}" -name '*.ko' -exec xz {} +
 }
 
 package_bbswitch-dkms() {
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 475525ac2..a23f1fdf4 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -11,13 +11,12 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_basekernel=4.14
-_archrel=45
-_parabolarel=2
+_basekernel=4.15
+_archrel=7
+_parabolarel=1
 
 pkgname=tp_smapi
-_pkgname=tp-smapi
-pkgver=0.42
+pkgver=0.42+7+g76c5120
 pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel}
 _extramodules=extramodules-${_basekernel}
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
@@ -28,17 +27,23 @@ 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>=${_basekernel}" "linux-libre<${_toohigh}")
-makedepends=("linux-libre-headers>=${_basekernel}" "linux-libre-headers<${_toohigh}")
+makedepends=("linux-libre-headers>=${_basekernel}" "linux-libre-headers<${_toohigh}" "git")
 makedepends+=('libelf')
 
 replaces=("${pkgname}-libre" "${pkgname}-parabola")
 conflicts=("${pkgname}-libre" "${pkgname}-parabola")
 
-source=("${pkgname}-${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${pkgname}/archive/${_pkgname}/${pkgver}.tar.gz")
-sha256sums=('cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381')
+_commit=76c5120f7be4880cf2c6801f872327e4e70c449f # master
+source=("git+https://github.com/evgeni/tp_smapi#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^tp-smapi\///;s/-/+/g'
+}
 
 build() {
-  cd "${pkgname}-${_pkgname}-${pkgver}"
+  cd $pkgname
 
   # 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
@@ -47,13 +52,13 @@ build() {
 }
 
 package() {
-  cd "${pkgname}-${_pkgname}-${pkgver}"
+  cd $pkgname
 
   # install kernel modules
   find . -name "*.ko" -exec install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" {} +
 
   # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
+  find "${pkgdir}" -name "*.ko" -exec xz {} +
 
   # load module on startup
   install -dm 755 "${pkgdir}/usr/lib/modules-load.d"
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index a2fd335d9..b11865cf9 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -6,9 +6,9 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-_basekernel=4.14
-_archrel=31
-_parabolarel=2
+_basekernel=4.15
+_archrel=44
+_parabolarel=1
 
 pkgbase=vhba-module
 pkgname=(vhba-module vhba-module-dkms)
@@ -42,11 +42,11 @@ package_vhba-module() {
   conflicts=("${pkgbase}-libre" "${pkgbase}-parabola")
 
   cd $pkgbase-$pkgver
-  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 vhba.ko
+  install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 *.ko
   install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules
   echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf"
 
-  find "$pkgdir" -name '*.ko' -exec gzip -n {} +
+  find "$pkgdir" -name '*.ko' -exec xz {} +
 }
 
 package_vhba-module-dkms() {