Bumped version, and resynced PKGBUILD with upstream arch.

1 files changed, 54 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ed5c4b8..7888a6e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux-pinebookpro
-pkgver=6.1.10.pbp1
+pkgver=6.3.1.megi1
 pkgrel=1
 pkgdesc='Pinebook Pro Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -11,39 +11,55 @@ url="https://git.kent-dobias.com/system/linux/log/?h=$_srctag"
 arch=(aarch64)
 license=(GPL2)
 makedepends=(
-  bc kmod libelf pahole
+  bc
+  cpio
+  gettext
   git
+  libelf
+  pahole
+  perl
+  tar
+  xz
+
   dtc
-  clang llvm lld
+  clang
+  llvm
+  lld
 )
 options=('!strip')
 _srcname=kentdobias-linux
 source=(
   "$_srcname::git+https://git.kent-dobias.com/system/linux?signed#tag=$_srctag"
-  config
+  config  # the main kernel config file
 )
 validpgpkeys=(
-  'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
-  '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
-  '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
-  '0E3A444DD0760E65901BF59679E824090BD31086'  # Jaron Kent-Dobias
+  ABAF11C65A2970B130ABE3C479BE3E4300411886  # Linus Torvalds
+  647F28654894E3BD457199BE38DBBDC86092693E  # Greg Kroah-Hartman
+  A2FF3A36AAA56654109064AB19802F8B0D70FC30  # Jan Alexander Steffens (heftig)
+  C7E7849466FE2358343588377258734B41C31549  # David Runge <dvzrv@archlinux.org>
+  0E3A444DD0760E65901BF59679E824090BD31086  # Jaron Kent-Dobias
 )
-sha256sums=('SKIP'
-            '5177ccb02d3c3bd2658607d58b29fab3596d8da3ff4d1d6ae2e2408bacbba502')
+b2sums=('SKIP'
+        'c829341050f4482c5430bb7c735c2a6ffa62d09daf4ba774985c3bf60bf8f1991e935d98dee5067a2753dd3f0bce11521e8b1c3ba6957b7172a976bf3e36a89a')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
-_make='make ARCH=arm64 LLVM=1'
+_make() {
+  test -s version
+  make ARCH=arm64 LLVM=1 KERNELRELEASE="$(<version)" "$@"
+}
 
 prepare() {
   cd $_srcname
 
   echo "Setting version..."
-  scripts/setlocalversion --save-scmversion
   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
@@ -56,46 +72,58 @@ 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 all
 #  $_make htmldocs
 }
 
 _package() {
   pkgdesc="The $pkgdesc kernel and modules"
-  depends=(coreutils kmod initramfs)
-  optdepends=('crda: to set the correct wireless channels of your country'
-              'linux-firmware: firmware images needed for some devices')
-  provides=(linux VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE)
-  replaces=(virtualbox-guest-modules-arch wireguard-arch)
-  conflicts=(linux)
+  depends=(
+    coreutils
+    initramfs
+    kmod
+  )
+  optdepends=(
+    'wireless-regdb: to set the correct wireless channels of your country'
+    'linux-firmware: firmware images needed for some devices'
+  )
+  provides=(
+    KSMBD-MODULE
+    VIRTUALBOX-GUEST-MODULES
+    WIREGUARD-MODULE
+  )
+  replaces=(
+    virtualbox-guest-modules-arch
+    wireguard-arch
+  )
 
   cd $_srcname
-  local kernver="$(<version)"
-  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
+  local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
 
   echo "Installing boot image..."
   install -Dm644 arch/arm64/boot/Image "${pkgdir}/boot/Image"
 
   # 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 modules_install
+  _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 and source links
   rm "$modulesdir"/{source,build}