Updated to 4.19.16.a | Added workaround for broken CONFIG_LOCALVERSION

2 files changed, 21 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 308ef13..4acc542 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@
 
 pkgbase=linux-hardened-ck
 _majver=4.19
-_minver=5
+_minver=6
 _pkgver=${_majver}.${_minver}
 _hardenedver=a
 _NUMAdisable=y
@@ -50,14 +50,14 @@ source=(https://www.kernel.org/pub/linux/kernel/v4.x/linux-${_pkgver}.tar.xz
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
 )
-sha256sums=('8c839ec29cce7eb0e8ef7eaa10d1eb9d84d2be2521e352fb4f9414e76856ef75'
+sha256sums=('644e61beb66211c0c5c13f91d96de1725055e6eea4cda7bb37ce9929ba8f09c3'
             'SKIP'
-            '8eb32a90c0c632ac20f2aed88c3914511ccb30d3ddc7630a2c493d8f4669c8c6'
+            '5596b5f020f6681a69964c60db9373a7a1dd459e279f3caf041a4545039f6166'
             'SKIP'
             'ace81dad929001a441c028974e1bb014bacabc39d8311efd944fb087dab1436a'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
-            '916153dab9c5ed8ea3f5378506c7168b641a5f06ffca2fcaff6f99c48aed23e8'
+            'b2f07216290c631814f95860779c1b8ee8a58f1807b55dd78e041625599b3138'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
@@ -130,14 +130,28 @@ prepare() {
   fi
 
   make olddefconfig
-  
+
   make menuconfig
 
   make -s kernelrelease > ../version
-  msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
+
+  # workaround for make -s kernelrelease not applying
+  # localversion to version when changed using menuconfig
+  #grep -Po '(?<=CONFIG_LOCALVERSION=").*(?=")' .config > localversion.30-localname
+  grep -Po '(?<=CONFIG_LOCALVERSION=").*(?=")' .config > ../localversion
+  echo "$_pkgver" > ../version.temp
+  echo ".$_hardenedver" >> ../version.temp
+  cat "localversion.10-pkgrel" >> ../version.temp
+  cat "localversion.20-pkgname" >> ../version.temp
+  cat ../localversion >> ../version.temp
+  cat ../version.temp | tr -d "\n" > ../version
+  #cp ../localversion.temp ../version
 
   # back up the config
+  msg2 "Backing up config..."
   cp .config ${SRCDEST}/config.hardened-ck.previous
+
+  msg2 "Prepared %s version %s" "$pkgbase" "$(<../version)"
 }
 
 build() {
diff --git a/config.x86_64 b/config.x86_64
index 2325873..ddddb70 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.5 Kernel Configuration
+# Linux/x86 4.19.6 Kernel Configuration
 #
 
 #