[arch-commits] Commit in linux-hardened/trunk (4 files)

[Levente Polyak]

    Date: Friday, November 30, 2018 @ 07:56:24
  Author: anthraxx
Revision: 340654

upgpkg: linux-hardened 4.19.5.a-1

Modified:
  linux-hardened/trunk/90-linux.hook
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config.x86_64
  linux-hardened/trunk/linux.install

---------------+
 90-linux.hook |    2 +-
 PKGBUILD      |   23 ++++++++++-------------
 config.x86_64 |    2 +-
 linux.install |    2 ++
 4 files changed, 14 insertions(+), 15 deletions(-)

Modified: 90-linux.hook
===================================================================
--- 90-linux.hook	2018-11-30 07:42:31 UTC (rev 340653)
+++ 90-linux.hook	2018-11-30 07:56:24 UTC (rev 340654)
@@ -2,7 +2,7 @@
 Type = File
 Operation = Install
 Operation = Upgrade
-Target = boot/vmlinuz-%PKGBASE%
+Target = usr/lib/modules/%KERNVER%/vmlinuz
 Target = usr/lib/initcpio/*
 
 [Action]

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-30 07:42:31 UTC (rev 340653)
+++ PKGBUILD	2018-11-30 07:56:24 UTC (rev 340654)
@@ -4,7 +4,7 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgbase=linux-hardened
-_pkgver=4.19.4
+_pkgver=4.19.5
 _hardenedver=a
 _srcname=linux-${_pkgver}
 pkgver=${_pkgver}.${_hardenedver}
@@ -23,13 +23,13 @@
         linux.preset   # standard config files for mkinitcpio ramdisk
 )
 replaces=('linux-grsec')
-sha256sums=('a38f5606bba1f5611c798541f6c3d43267b8599d9e3167471d4b662e33ff47aa'
+sha256sums=('8c839ec29cce7eb0e8ef7eaa10d1eb9d84d2be2521e352fb4f9414e76856ef75'
             'SKIP'
-            '2779c1dc568958f54b012c5bef9e1e6e0bc714e02910e831a916c5f4d2ad43ce'
+            '8eb32a90c0c632ac20f2aed88c3914511ccb30d3ddc7630a2c493d8f4669c8c6'
             'SKIP'
-            '3fcaa87fd4da7f155c9c7b3284b5b4a9cf9b5a459e4b278cc1ebc4e9943579ff'
+            '684c4e47f04970d78948720109905a63ef31097b5ef6d447f9a5dbe94169ed11'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
-            '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
+            'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -82,22 +82,19 @@
   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"
+  # 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 "$modulesdir/vmlinuz" "$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
   local extramodules="extramodules$_kernelname"

Modified: config.x86_64
===================================================================
--- config.x86_64	2018-11-30 07:42:31 UTC (rev 340653)
+++ config.x86_64	2018-11-30 07:56:24 UTC (rev 340654)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.4 Kernel Configuration
+# Linux/x86 4.19.5 Kernel Configuration
 #
 
 #

Modified: linux.install
===================================================================
--- linux.install	2018-11-30 07:42:31 UTC (rev 340653)
+++ linux.install	2018-11-30 07:56:24 UTC (rev 340654)
@@ -9,3 +9,5 @@
   rm -f boot/initramfs-%PKGBASE%.img
   rm -f boot/initramfs-%PKGBASE%-fallback.img
 }
+
+# vim:set ft=sh ts=8 sts=2 sw=2 et: