[arch-commits] Commit in linux-zen/trunk (90-linux.hook PKGBUILD linux.install)

[Jan Steffens]

    Date: Tuesday, November 27, 2018 @ 19:09:45
  Author: heftig
Revision: 340495

4.19.5.zen1-1

Modified:
  linux-zen/trunk/90-linux.hook
  linux-zen/trunk/PKGBUILD
  linux-zen/trunk/linux.install

---------------+
 90-linux.hook |    2 +-
 PKGBUILD      |   17 +++++++----------
 linux.install |    2 ++
 3 files changed, 10 insertions(+), 11 deletions(-)

Modified: 90-linux.hook
===================================================================
--- 90-linux.hook	2018-11-27 19:08:44 UTC (rev 340494)
+++ 90-linux.hook	2018-11-27 19:09:45 UTC (rev 340495)
@@ -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-27 19:08:44 UTC (rev 340494)
+++ PKGBUILD	2018-11-27 19:09:45 UTC (rev 340495)
@@ -4,7 +4,7 @@
 
 pkgbase=linux-zen           # Build stock -zen kernel
 #pkgbase=linux-custom       # Build kernel with a different name
-_srcver=4.19.4-zen1
+_srcver=4.19.5-zen1
 pkgver=${_srcver//-/.}
 pkgrel=1
 arch=(x86_64)
@@ -28,7 +28,7 @@
 sha256sums=('SKIP'
             '4e4da53c86f21f5949519c57884d322a486107ea1559a5ff9f2318c08cafcdf1'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
-            '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
+            'c043f3033bb781e2688794a59f6d1f7ed49ef9b13eb77ff9a425df33a244a636'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 
 _kernelname=${pkgbase#linux}
@@ -73,22 +73,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: linux.install
===================================================================
--- linux.install	2018-11-27 19:08:44 UTC (rev 340494)
+++ linux.install	2018-11-27 19:09:45 UTC (rev 340495)
@@ -8,3 +8,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: