[tp_smapi][tp_smapi-lts]: upgrade to v0.44

2 files changed, 35 insertions, 33 deletions

diff --git a/libre/tp_smapi-lts/PKGBUILD b/libre/tp_smapi-lts/PKGBUILD
index 234ae406f..c426652eb 100644
--- a/libre/tp_smapi-lts/PKGBUILD
+++ b/libre/tp_smapi-lts/PKGBUILD
@@ -9,6 +9,13 @@
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+# parabola changes and rationale:
+#  - re-package for linux-libre
+#  - build from versioned source-ball rather than VCS
+#  - pin to kernel versions
 
 
 # build order:
@@ -28,28 +35,23 @@
 
 _basekernel=5.15.88
 
-pkgname=tp_smapi-lts
-pkgver=0.43
-pkgrel=207
+pkgname=tp_smapi
+pkgver=0.44
+pkgrel=15
 pkgrel+=.parabola1.basekernel${_basekernel}
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
-pkgdesc+=" (for linux-libre-lts)"
+pkgdesc+=" (for 'linux-libre-lts')"
 arch=('x86_64')
 arch+=('i686')
 url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-makedepends=(linux-libre-lts-headers=${_basekernel} 'git' libelf)
-_commit=a63729ab30d85430048f65c37f29188ab484cd52  # tags/tp-smapi/0.43
-source=("git+https://github.com/evgeni/tp_smapi#commit=$_commit")
-sha256sums=('SKIP')
+license=(GPL)
+makedepends=(linux-libre-lts-headers=${_basekernel})
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linux-thinkpad/${pkgname}/archive/refs/tags/${pkgname/_/-}/${pkgver}.tar.gz)
+sha256sums=('ccc317157c71df621ef92e0213c3a813de4a792fa1dce16a1784944edfcb9ea4')
 
-pkgver() {
-  cd tp_smapi
-  git describe --tags | sed 's/^tp-smapi\///;s/-/+/g'
-}
 
 build() {
-  cd tp_smapi
+  cd ${pkgname}-${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
@@ -61,12 +63,10 @@ package() {
   depends=(linux-libre-lts=${_basekernel})
 
   local extradir=/usr/lib/modules/$(</usr/src/linux-libre-lts/version)/extramodules
-  cd tp_smapi
+  cd ${pkgname}-${pkgname/_/-}-${pkgver}
 
-  # install kernel modules
   find . -name "*.ko" -exec install -Dt "$pkgdir$extradir" {} +
-
-  # compress kernel modules
+  find "$pkgdir" -name "*.ko" -exec strip --strip-debug {} +
   find "$pkgdir" -name "*.ko" -exec xz {} +
 
   # load module on startup
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index abc79ca16..fba40025c 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -9,6 +9,13 @@
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+# parabola changes and rationale:
+#  - re-package for linux-libre
+#  - build from versioned source-ball rather than VCS
+#  - pin to kernel versions
 
 
 # build order:
@@ -26,30 +33,25 @@
 # update '_basekernel', and commit the changes to VCS, if successful.
 
 
-_basekernel=6.1.5
+_basekernel=6.5.8
 
 pkgname=tp_smapi
-pkgver=0.43
-pkgrel=364
+pkgver=0.44
+pkgrel=15
 pkgrel+=.parabola1.basekernel${_basekernel}
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
-pkgdesc+=" (for linux-libre)"
+pkgdesc+=" (for 'linux-libre')"
 arch=('x86_64')
 arch+=('i686')
 url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-makedepends=(linux-libre-headers=${_basekernel} git libelf)
-_commit=a63729ab30d85430048f65c37f29188ab484cd52  # tags/tp-smapi/0.43
-source=("git+https://github.com/evgeni/tp_smapi#commit=$_commit")
-sha256sums=('SKIP')
+license=(GPL)
+makedepends=(linux-libre-headers=${_basekernel})
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linux-thinkpad/${pkgname}/archive/refs/tags/${pkgname/_/-}/${pkgver}.tar.gz)
+sha256sums=('ccc317157c71df621ef92e0213c3a813de4a792fa1dce16a1784944edfcb9ea4')
 
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^tp-smapi\///;s/-/+/g'
-}
 
 build() {
-  cd $pkgname
+  cd ${pkgname}-${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
@@ -61,7 +63,7 @@ package() {
   depends=(linux-libre=${_basekernel})
 
   local extradir=/usr/lib/modules/$(</usr/src/linux-libre/version)/extramodules
-  cd $pkgname
+  cd ${pkgname}-${pkgname/_/-}-${pkgver}
 
   find . -name "*.ko" -exec install -Dt "$pkgdir$extradir" {} +
   find "$pkgdir" -name "*.ko" -exec strip --strip-debug {} +