Updated to 5.5.0-799b9141e48783a0844187ad00855b3d53f77998

1 files changed, 28 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3393172..6bb57d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,48 +4,45 @@
 
 # # I maintain this because:
 # Manjaro version patch script does not apply consistently
-# Arch version lacks ath9k regdom and raid6 algo patches
+# Manjaro version lacks ath9k regdom patches
+# Manjaro version is 100 Hz
 # Manjaro version uses git
 # Manjaro version lacks cake modules
 
 pkgbase=linux-pinebookpro
-_pkgname=linux-pinebook-pro
-_exname=pinebookpro
 _supver=5
-_majver=4
+_majver=5
 _minver=0
   if [ "$_minver" == "0" ]; then
     pkgver=${_supver}.${_majver}
   else
     pkgver=${_supver}.${_majver}.${_minver}
   fi
-pkgrel=11
+pkgrel=3.1
 pkgdesc='Linux-PineBookPro'
-url='https://gitlab.manjaro.org/tsys/linux-pinebook-pro'
+url='https://kernel.org'
+#url='https://gitlab.manjaro.org/tsys/linux-pinebook-pro'
 arch=(aarch64)
 #arch=(x86_64)
 license=(GPL2)
 makedepends=(
   bc kmod libelf
-  dtc uboot-tools vboot-utils
+  dtc uboot-tools
 )
 provides=('linux')
 conflicts=('linux')
 options=('!strip')
 _srcname=linux-${pkgver}
-_commit=a48441783fc6f15bd076dc0d01ecc2913d79260a
+_commit=799b9141e48783a0844187ad00855b3d53f77998
+# https://gitlab.manjaro.org/tsys/linux-pinebook-pro/-/archive/799b9141e48783a0844187ad00855b3d53f77998/linux-pinebook-pro-799b9141e48783a0844187ad00855b3d53f77998.tar.gz
 source=(
   https://www.kernel.org/pub/linux/kernel/v${_supver}.x/${_srcname}.tar.{xz,sign}
   pinebookpro-$_commit.patch
   0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
-  0001-arm64-dts-rockchip-remove-capacity-dmips-rk3399.patch
+  0002-raid6-add-Kconfig-option-to-skip-raid6-benchmarking.patch
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch
   ath9k-regdom-hack.patch
-  raid6-default-algo.patch
   config         # the main kernel config file
-  kernel.its
-  kernel.keyblock
-  kernel_data_key.vbprivk
   linux.preset
   60-linux.hook
   90-linux.hook
@@ -55,23 +52,19 @@ validpgpkeys=(
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
 # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
-            'SKIP'
-            '4b42263a879a282dd449897d9531dc007696e3a13cda3295aa49106007ecf94d'
-            '5ed674a3a420c1a93b77cb9e243c202996d3783138182816fc37a17367a84474'
-            '5e83715ae4d1ffe179091f88f2443cb068007c20b77b833eb2908e4d64217564'
-            'e862ecd2cb0b20e1859ec3e47616457a9a3acb111cd5a86094f9ed1dbd7f42ac'
-            'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
-            '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
-            '8f9c5b6b6d9d84e24dcb63f3aad62cd86e0e04064cacc8da42ecfda20a08eaca'
-            'd074a28bd31972fbca42f9e91624a2f873350428a89d9a9af6d0ace32686475f'
-            '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb'
-            'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b'
-            '66644820faa950a5fc59181f5aefcbed6d7ed652b29aee69979a2be2a032025d'
-            'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
-            '71df1b18a3885b151a3b9d926a91936da2acc90d5e27f1ad326745779cd3759d')
-
-export KBUILD_BUILD_HOST=$_exname
+b2sums=('36b990d3650c409652206c319c93c0cf68885334050bc286b479c8b844bc47354547e19eebb58caafb026b96d134f39f0c7ce38b4eebe9da7ea6d1610a1e2af2'
+        'SKIP'
+        'c081fab3c3a482970f23ff4d4f6d140d1813721d6ee616b4e6cb344b71c306394cbb358130073faefe20f94427065547fa5b28ea4e7abd40c0a96e6bff3115e5'
+        '62b160245a0bca5a27ef7afe83d860a48c220645f4fc6e075b7b39a45d668932b21ee86594747fab7a4d4e7a3006284e6683ecb741a0c88e92aa89ed73399f96'
+        '1491b6281ec7b08b37bd543b25c41a2717efc6762dcd65fbc99882177a8b764cfc0bbc0129680bd9da3ec9b96d0b27651bd99155f0f66fa4314edcd7e4718234'
+        '464e0aa46dc59c59ad322b4e5770c316c5ff2efc95a6ca53bd973d4c872a6397222daa27d803f4d21be717ea974c2b66ad38faa0a77713e1167e3fb16170572b'
+        '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
+        '50fbbffa07234ca67a029649883030ef59798c045b912a727b1c4f6c9b19d27a39eac85d78cb40c577d5f268513faadb69a510f8d3d3ce25dae0ab0a19ca3e70'
+        'f0cb39a8e448dc93cd830f1680303ecfcda6c729030ecf0bbf6dd8c57777a12ab33bbd991da4f735ba5869afb59d39f5cf5c7c725cc9ba6a78c235c2fd00251a'
+        '40e2e0ac9eec9f9c08593875ca5bb8a26f835e33ae42e3718b98e83d76bbbc51a68395215c707fe58269954127261f7f8d12ec47341d28c672de973f3c4e71e8'
+        'f39994fda3d76407b0af192534ca9931782b3e9de4e438a3adbc7640fc794c261102e5c7bfa1523c291ef8c7256c1106e6dbd40814006329c48d90f51c569e82')
+
+export KBUILD_BUILD_HOST=$pkgbase
 export KBUILD_BUILD_USER=$pkgbase
 export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 
@@ -86,27 +79,20 @@ prepare() {
 
   # Out of tree changes for pinebookpro to function
   msg2 "Applying pinebookpro patch"
-  patch -p1 -i ../pinebookpro-$_commit.patch
+  patch -p1 -i "${srcdir}/pinebookpro-$_commit.patch"
 
   # ALARM patches
-  patch -Np1 -i ..//0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
-
-  # Manjaro ARM Patches
-  patch -Np1 -i ../0001-arm64-dts-rockchip-remove-capacity-dmips-rk3399.patch
-
+  patch -Np1 -i "${srcdir}/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch"
+  patch -p1 -i "${srcdir}/0002-raid6-add-Kconfig-option-to-skip-raid6-benchmarking.patch"
 
   # Hotfixes
   msg2 "Applying hotfixes"
-  patch -p1 -i ../0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch
+  patch -p1 -i "${srcdir}/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-CLONE_NEWUSER.patch"
 
 
   # Ignore ath9k eeprom patch
   msg2 "Applying ath9k patch"
-  patch -p1 -i ../ath9k-regdom-hack.patch
-
-  # Set default raid6 algo patch
-  msg2 " Applying raid6 patch"
-  patch -p1 -i ../raid6-default-algo.patch
+  patch -p1 -i "${srcdir}/ath9k-regdom-hack.patch"
 
 
   msg2 "Setting version..."