acpi_call{,-dkms,-lts}:tp_smapi{,-lts}: rebuild against latest kernels

6 files changed, 32 insertions, 15 deletions

diff --git a/libre/acpi_call-dkms/PKGBUILD b/libre/acpi_call-dkms/PKGBUILD
index ac07ff1c8..814955791 100644
--- a/libre/acpi_call-dkms/PKGBUILD
+++ b/libre/acpi_call-dkms/PKGBUILD
@@ -19,14 +19,16 @@
 #   linux-libre-headers     <- acpi_call
 #                              tp_smapi
 #
+# NOTE: It is normally not necessary to edit any of these PKGBUILDs.
 # These packages may be built as a batch, with the helper script:
 #   'scripts/package-all-acpi_call-tp_smapi'
 # Simply edit 'KERNEL_VER' and/or 'KERNEL_LTS_VER' in the helper script.
-# It will build only those which the PKGBUILD '_basekernel' differs,
+# It will build any or all of the above packages,
+# but only those for which the PKGBUILD '_basekernel' differs,
 # update '_basekernel', and commit the changes to VCS, if successful.
 
 
-_basekernel=6.5.8
+_basekernel=6.7.4
 
 pkgname=acpi_call-dkms
 _tag='9f1c0b5d046bdfdec769809435257647fd475473' # git rev-parse v${_tag_name}
diff --git a/libre/acpi_call-lts/PKGBUILD b/libre/acpi_call-lts/PKGBUILD
index acf62290d..799198d19 100644
--- a/libre/acpi_call-lts/PKGBUILD
+++ b/libre/acpi_call-lts/PKGBUILD
@@ -19,14 +19,16 @@
 #   linux-libre-headers     <- acpi_call
 #                              tp_smapi
 #
+# NOTE: It is normally not necessary to edit any of these PKGBUILDs.
 # These packages may be built as a batch, with the helper script:
 #   'scripts/package-all-acpi_call-tp_smapi'
 # Simply edit 'KERNEL_VER' and/or 'KERNEL_LTS_VER' in the helper script.
-# It will build only those which the PKGBUILD '_basekernel' differs,
+# It will build any or all of the above packages,
+# but only those for which the PKGBUILD '_basekernel' differs,
 # update '_basekernel', and commit the changes to VCS, if successful.
 
 
-_basekernel=5.15.88
+_basekernel=6.6.14
 
 pkgname=acpi_call-lts
 pkgver=1.2.2
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 197887fc3..6e31a0378 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -19,14 +19,16 @@
 #   linux-libre-headers     <- acpi_call
 #                              tp_smapi
 #
+# NOTE: It is normally not necessary to edit any of these PKGBUILDs.
 # These packages may be built as a batch, with the helper script:
 #   'scripts/package-all-acpi_call-tp_smapi'
 # Simply edit 'KERNEL_VER' and/or 'KERNEL_LTS_VER' in the helper script.
-# It will build only those which the PKGBUILD '_basekernel' differs,
+# It will build any or all of the above packages,
+# but only those for which the PKGBUILD '_basekernel' differs,
 # update '_basekernel', and commit the changes to VCS, if successful.
 
 
-_basekernel=6.5.8
+_basekernel=6.7.4
 
 pkgname=acpi_call
 pkgver=1.2.2
diff --git a/libre/tp_smapi-lts/PKGBUILD b/libre/tp_smapi-lts/PKGBUILD
index c426652eb..4f545af94 100644
--- a/libre/tp_smapi-lts/PKGBUILD
+++ b/libre/tp_smapi-lts/PKGBUILD
@@ -26,16 +26,19 @@
 #   linux-libre-headers     <- acpi_call
 #                              tp_smapi
 #
+# NOTE: It is normally not necessary to edit any of these PKGBUILDs.
 # These packages may be built as a batch, with the helper script:
 #   'scripts/package-all-acpi_call-tp_smapi'
 # Simply edit 'KERNEL_VER' and/or 'KERNEL_LTS_VER' in the helper script.
-# It will build only those which the PKGBUILD '_basekernel' differs,
+# It will build any or all of the above packages,
+# but only those for which the PKGBUILD '_basekernel' differs,
 # update '_basekernel', and commit the changes to VCS, if successful.
 
 
-_basekernel=5.15.88
+_basekernel=6.6.14
 
-pkgname=tp_smapi
+pkgname=tp_smapi-lts
+_upstream_name=tp_smapi
 pkgver=0.44
 pkgrel=15
 pkgrel+=.parabola1.basekernel${_basekernel}
@@ -46,12 +49,12 @@ arch+=('i686')
 url='https://github.com/evgeni/tp_smapi'
 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)
+source=(${_upstream_name}-${pkgver}.tar.gz::https://github.com/linux-thinkpad/${_upstream_name}/archive/refs/tags/${_upstream_name/_/-}/${pkgver}.tar.gz)
 sha256sums=('ccc317157c71df621ef92e0213c3a813de4a792fa1dce16a1784944edfcb9ea4')
 
 
 build() {
-  cd ${pkgname}-${pkgname/_/-}-${pkgver}
+  cd ${_upstream_name}-${_upstream_name/_/-}-${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
@@ -63,7 +66,7 @@ package() {
   depends=(linux-libre-lts=${_basekernel})
 
   local extradir=/usr/lib/modules/$(</usr/src/linux-libre-lts/version)/extramodules
-  cd ${pkgname}-${pkgname/_/-}-${pkgver}
+  cd ${_upstream_name}-${_upstream_name/_/-}-${pkgver}
 
   find . -name "*.ko" -exec install -Dt "$pkgdir$extradir" {} +
   find "$pkgdir" -name "*.ko" -exec strip --strip-debug {} +
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index fba40025c..173def259 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -26,14 +26,16 @@
 #   linux-libre-headers     <- acpi_call
 #                              tp_smapi
 #
+# NOTE: It is normally not necessary to edit any of these PKGBUILDs.
 # These packages may be built as a batch, with the helper script:
 #   'scripts/package-all-acpi_call-tp_smapi'
 # Simply edit 'KERNEL_VER' and/or 'KERNEL_LTS_VER' in the helper script.
-# It will build only those which the PKGBUILD '_basekernel' differs,
+# It will build any or all of the above packages,
+# but only those for which the PKGBUILD '_basekernel' differs,
 # update '_basekernel', and commit the changes to VCS, if successful.
 
 
-_basekernel=6.5.8
+_basekernel=6.7.4
 
 pkgname=tp_smapi
 pkgver=0.44
diff --git a/scripts/package-all-acpi_call-tp_smapi b/scripts/package-all-acpi_call-tp_smapi
index 8ff5f8a7a..8f617e05e 100755
--- a/scripts/package-all-acpi_call-tp_smapi
+++ b/scripts/package-all-acpi_call-tp_smapi
@@ -5,6 +5,7 @@ readonly KERNEL_VER=6.5.8
 readonly KERNEL_LTS_VER=5.15.88
 readonly CHROOT_NAMES=( armv7h i686 x86_64 )
 readonly ABS_ROOT=/var/lib/archbuild/abslibre # no spaces
+readonly ABS_UPSTREAM=parabola
 readonly PKG_DIRS=( ${ABS_ROOT}/libre/acpi_call{-dkms,,-lts}   # -dkms first
                     ${ABS_ROOT}/libre/tp_smapi{,-lts}        ) # no trailing slashes
 readonly PKGBUILDS=( ${PKG_DIRS[*]/%/\/PKGBUILD} )
@@ -17,10 +18,12 @@ Main()
   local all_pkgs=()
   local commit_msg=''
 
+  echo -e "\nupgrading chroots\n"
   for chroot in ${CHROOT_NAMES[*]}
   do  sudo librechroot -n ${chroot} update || exit 1
   done
 
+  echo -e "\nbuilding packages\n"
   for pkg_dir in ${PKG_DIRS[*]}
   do  kver=$( [[ "${pkg_dir}" =~ -lts$ ]] && echo ${KERNEL_LTS_VER} || echo ${KERNEL_VER} )
       pkgs=()
@@ -67,4 +70,7 @@ Main()
 }
 
 
-Main
+if   git pull $ABS_UPSTREAM master &> /dev/null
+then Main
+else echo "failed to synchronize abslibre VCS - is the working tree dirty?"
+fi