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

[Andreas Radke]

    Date: Thursday, December 8, 2016 @ 19:25:46
  Author: andyrtr
Revision: 282941

fix #51818 lvm2 breakage, move to mkinitcpio running as pacman hook

Added:
  linux-lts/trunk/99-linux.hook
Modified:
  linux-lts/trunk/PKGBUILD
  linux-lts/trunk/linux-lts.install

-------------------+
 99-linux.hook     |   11 +++++++++++
 PKGBUILD          |    7 +++++++
 linux-lts.install |    4 ----
 3 files changed, 18 insertions(+), 4 deletions(-)

Added: 99-linux.hook
===================================================================
--- 99-linux.hook	                        (rev 0)
+++ 99-linux.hook	2016-12-08 19:25:46 UTC (rev 282941)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/vmlinuz-%PKGBASE%
+Target = usr/lib/initcpio/*
+
+[Action]
+Description = Updating %PKGBASE% initcpios
+When = PostTransaction
+Exec = /usr/bin/mkinitcpio -p %PKGBASE%

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-08 16:17:26 UTC (rev 282940)
+++ PKGBUILD	2016-12-08 19:25:46 UTC (rev 282941)
@@ -15,6 +15,8 @@
         https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.{xz,sign}
         # the main kernel config files
         'config' 'config.x86_64'
+        # pacman hook for initramfs regeneration
+        '99-linux.hook'
         # standard config files for mkinitcpio ramdisk
         linux-lts.preset
         change-default-console-loglevel.patch
@@ -27,6 +29,7 @@
             'SKIP'
             'b11702727b1503e5a613946790978481d34d8ecc6870337fadd3ce1ef084a8e2'
             '68c7296ff2f5f55d69e83aa4d20f925df740b1eb1e6bdb0f13e8a170360ed09f'
+            '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
             '1f036f7464da54ae510630f0edb69faa115287f86d9f17641197ffda8cfd49e0'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
@@ -135,6 +138,10 @@
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
     -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
+  # install pacman hook for initramfs regeneration
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
+    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
+
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware

Modified: linux-lts.install
===================================================================
--- linux-lts.install	2016-12-08 16:17:26 UTC (rev 282940)
+++ linux-lts.install	2016-12-08 19:25:46 UTC (rev 282941)
@@ -8,8 +8,6 @@
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
 }
 
 post_upgrade() {
@@ -20,8 +18,6 @@
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
 
   if [ $(vercmp $2 3.13) -lt 0 ]; then
     echo ">>> WARNING: AT keyboard support is no longer built into the kernel."