Updated to 4.19.5.a | Added more maintainer logic | Reduced PKGBUILD differences from upstream

2 files changed, 11 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 044bb33..247ffbb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,17 @@
 # Contributor (Arch): Thomas Baechler <thomas@archlinux.org>
 
 # # I maintain this because:
+# Arch version patch script does not apply consistently
 # Arch version lacks ck ath9k and greysky2 patches
 # Arch version allows SM3 and SM4
 # Arch version is 300 Hz
 # Arch version supports Intel ME
+# Arch version is not configured for openrc
+# Arch version builds docs using python and graphviz
 
 pkgbase=linux-hardened-ck
 _majver=4.19
-_minver=4
+_minver=5
 _pkgver=${_majver}.${_minver}
 _hardenedver=a
 _NUMAdisable=y
@@ -47,9 +50,9 @@ 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=('a38f5606bba1f5611c798541f6c3d43267b8599d9e3167471d4b662e33ff47aa'
+sha256sums=('8c839ec29cce7eb0e8ef7eaa10d1eb9d84d2be2521e352fb4f9414e76856ef75'
             'SKIP'
-            '2779c1dc568958f54b012c5bef9e1e6e0bc714e02910e831a916c5f4d2ad43ce'
+            '8eb32a90c0c632ac20f2aed88c3914511ccb30d3ddc7630a2c493d8f4669c8c6'
             'SKIP'
             'ace81dad929001a441c028974e1bb014bacabc39d8311efd944fb087dab1436a'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
@@ -152,20 +155,16 @@ _package() {
   install=linux.install
 
   local kernver="$(<version)"
+  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
 
   cd $_srcname
 
   msg2 "Installing boot image..."
-  local image="$pkgdir/boot/vmlinuz-$pkgbase"
-  install -Dm644 "$(make -s image_name)" "$image"
+  install -Dm644 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase"
 
   msg2 "Installing modules..."
-  local modulesdir="$pkgdir/usr/lib/modules/$kernver"
   mkdir -p "$modulesdir"
   make INSTALL_MOD_PATH="$pkgdir/usr" modules_install
-  # systemd expects to find the kernel here to allow hibernation
-  # https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
-  # ln -sr "$image" "$modulesdir/vmlinuz"
 
   # a place for external modules,
   # with version file for building modules and running depmod from hook
@@ -273,11 +272,11 @@ _package-headers() {
         strip -v $STRIP_SHARED "$file" ;;
     esac
   done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
+
   msg2 "Adding symlink..."
   mkdir -p "$pkgdir/usr/src"
   ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase-$pkgver"
 
-
   msg2 "Fixing permissions..."
   chmod -Rc u=rwX,go=rX "$pkgdir"
 }
diff --git a/config.x86_64 b/config.x86_64
index 64513b2..2325873 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.4 Kernel Configuration
+# Linux/x86 4.19.5 Kernel Configuration
 #
 
 #
@@ -34,7 +34,7 @@ CONFIG_HAVE_KERNEL_LZ4=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 # CONFIG_KERNEL_LZ4 is not set
-CONFIG_DEFAULT_HOSTNAME="archlinux"
+CONFIG_DEFAULT_HOSTNAME="artixlinux"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y