1 files changed, 29 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7734276..6805482 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,19 @@
 
 pkgbase=linux-pinephone
 pkgver=6.7.3.megi1
-pkgrel=1
+pkgrel=2
 pkgdesc='Pinephone Linux'
-_srctag=v${pkgver%.*}-${pkgver##*.}
-url="https://git.kent-dobias.com/system/linux/log/?h=$_srctag"
+url='https://git.kent-dobias.com/system/linux'
 arch=(aarch64)
 license=(GPL2)
 makedepends=(
   bc
   cpio
   gettext
-  git
   libelf
   pahole
   perl
+  python
   tar
   xz
 
@@ -27,29 +26,37 @@ makedepends=(
   lld
 )
 options=('!strip')
-_srcname=kentdobias-linux
+_srcname=linux-${pkgver%.*}
+_srctag=v${pkgver%.*}-${pkgver##*.}
 source=(
-  "$_srcname::git+https://git.kent-dobias.com/system/linux?signed#tag=$_srctag"
+  https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
+  "linux-$_srctag.patch::$url/rawdiff/?id=$_srctag&id2=v${pkgver%.*}"
   config  # the main kernel config file
+  dts-pinephone-drop-modem-power-node.patch
 )
 validpgpkeys=(
   ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
   647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
   A2FF3A36AAA56654109064AB19802F8B0D70FC30  # Jan Alexander Steffens (heftig)
-  C7E7849466FE2358343588377258734B41C31549  # David Runge <dvzrv@archlinux.org>
   0E3A444DD0760E65901BF59679E824090BD31086  # Jaron Kent-Dobias
 )
-b2sums=('SKIP'
-        '1704ecca242cc656221fc2c7f69b8a88117fc1e9bd90b344d9e7943164aeb4e5cc950caff32a313c272a484e80d2a797228fb6ad971d7f64ab557bcf03b32c39')
+# https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
+sha256sums=('b7f08c652747574a3aa26e317d7a8f23ffab3fb645e1b1533b215dcfd5742b44'
+            'SKIP'
+            '736518aa936c42ffca627b914e87da343e87edebc2048d8476fdf7e2de94151c'
+            '61319499a75817a28ac5bcdb0e1e642867e563bd7b24101a151115c3a219bf41'
+            '4438dbb4fc8dd2788da95615cc97394591a6f5dc54851860f912c62fcc934973')
+b2sums=('2dea0685e5c9b279beb7661f4efa91ccd662d55eb7c5a69aff52fc74bbb574fcb490a9abcc44d895583ca21b3e6860b3c5e9c35daae66b22c4fe97cab44b2a75'
+        'SKIP'
+        '11b8c0a99dc4dba40dedcc2c0d22c4a299f23c048f4e6225f6afbd4a93c4926244f314408efca15597c60bd5a001d6f011f39621ee3f7f0f69c9639ba4a92bca'
+        '9d42ed5046d679eb4e7193cbed471774bb8a5701d55b919a514eda4d6ebf63856a44cfff0ad5061cfcb73b56a9b11fd6d4ff392793aa174b2248bfe678714fa4'
+        'a36eeb201687707a2662158c8ef8920609446d80315d18be4edb94cc5765743dcda0d98548779f2501a7eee4cba1713837dc5ecc5310c977edd3fd678f558414')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
-
-_make() {
-  test -s version
-  make ARCH=arm64 LLVM=1 KERNELRELEASE="$(<version)" "$@"
-}
+export ARCH=arm64
+export LLVM=1
 
 prepare() {
   cd $_srcname
@@ -57,14 +64,12 @@ prepare() {
   echo "Setting version..."
   echo "-$pkgrel" > localversion.10-pkgrel
   echo "${pkgbase#linux}" > localversion.20-pkgname
-  make ARCH=arm64 LLVM=1 defconfig
-  make ARCH=arm64 LLVM=1 -s kernelrelease > version
-#  make mrproper
 
   local src
   for src in "${source[@]}"; do
     src="${src%%::*}"
     src="${src##*/}"
+    src="${src%.zst}"
     [[ $src = *.patch ]] || continue
     echo "Applying patch $src..."
     patch -Np1 < "../$src"
@@ -72,16 +77,17 @@ prepare() {
 
   echo "Setting config..."
   cp ../config .config
-  _make olddefconfig
+  make olddefconfig
   diff -u ../config .config || :
 
+  make -s kernelrelease > version
   echo "Prepared $pkgbase version $(<version)"
 }
 
 build() {
   cd $_srcname
-  _make all
-#  $_make htmldocs
+  make all
+# make htmldocs
 }
 
 _package() {
@@ -114,17 +120,17 @@ _package() {
 
   # systemd expects to find the kernel here to allow hibernation
   # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  install -Dm644 "$(_make -s image_name)" "$modulesdir/vmlinuz"
+  install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
 
   # Used by mkinitcpio to name the kernel
   echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
 
   echo "Installing modules..."
-  _make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
+  ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
     DEPMOD=/doesnt/exist modules_install  # Suppress depmod
 
   echo "Installing dtbs..."
-  _make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
+  make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs" dtbs_install
 
   # remove build link
   rm "$modulesdir"/build