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

[Jan Steffens]

    Date: Tuesday, November 27, 2018 @ 19:09:53
  Author: heftig
Revision: 340497

Make lib/modules/*/vmlinuz a copy instead of a link

This is a step towards allowing kernel-install or similar handling.

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

---------------+
 90-linux.hook |    2 +-
 PKGBUILD      |   15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

Modified: 90-linux.hook
===================================================================
--- 90-linux.hook	2018-11-27 19:09:49 UTC (rev 340496)
+++ 90-linux.hook	2018-11-27 19:09:53 UTC (rev 340497)
@@ -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:09:49 UTC (rev 340496)
+++ PKGBUILD	2018-11-27 19:09:53 UTC (rev 340497)
@@ -28,7 +28,7 @@
 sha256sums=('SKIP'
             'e7fa30bb2de12d1a2488423e27c00f26d55668e310e69aaf93673c1afd89dbaf'
             '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"