From fed2f35b30e6af461bd5c738fefcabb83fc60a2b Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sat, 19 Nov 2016 17:03:47 -0300
Subject: linux-libre-pck-4.8.8_gnu.pck1-2: updating revision

* fix lvm2 breakage, move to mkinitcpio running as pacman hook - FS#51818 -> https://bugs.archlinux.org/task/51818
* overhaul sed'ding
---
 libre/linux-libre-pck/PKGBUILD | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'libre/linux-libre-pck/PKGBUILD')

diff --git a/libre/linux-libre-pck/PKGBUILD b/libre/linux-libre-pck/PKGBUILD
index 12b922f55..7396e3cd9 100644
--- a/libre/linux-libre-pck/PKGBUILD
+++ b/libre/linux-libre-pck/PKGBUILD
@@ -20,7 +20,7 @@ _replacesoldmodules=()
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}.${_pckpatchver}
-pkgrel=1
+pkgrel=2
 rcnrel=armv7-x4
 arch=('i686' 'x86_64' 'armv7h')
 url="https://wiki.parabola.nu/PCK"
@@ -42,6 +42,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm.sig"
         # the main kernel config files
         'config.i686' 'config.x86_64' 'config.armv7h'
+        # pacman hook for initramfs regeneration
+        '99-linux.hook'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
@@ -76,7 +78,8 @@ sha256sums=('d54e0f8a27e24f3666c19b395c19dba194635db26929c89e78ffa4b2b0e8ca3a'
             '6620e852ce153393fc27ca7d77ac9026ee35c85936fe68e295c8d51889c3d0d8'
             '95ee0377d2b78eea0cabe76cbdc53e9ff5a4da908736584e17b9535e45f7f3db'
             'f165934fe483329d772f5f65b8edcf692928c37084a497417293e6366aa8a9c2'
-            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
+            '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0'
+            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             'b0c2eb167174fea7dc1e2a760cb10e787ca911160c6e30480cc87657716b71f0'
             'SKIP'
@@ -218,22 +221,18 @@ _package() {
   fi
 
   # set correct depmod command for install
-  cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+  sed -e "s|%PKGBASE%|${pkgbase}|g;s|%KERNVER%|${_kernver}|g" \
+    "${startdir}/${install}" > "${startdir}/${install}.pkg"
   true && install=${install}.pkg
-  sed \
-    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
-    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
-    -i "${startdir}/${install}"
 
   if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
     # install mkinitcpio preset file for kernel
-    install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-    sed \
-      -e "1s|'linux.*'|'${pkgbase}'|" \
-      -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
-      -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
-      -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
-      -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+    sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" |
+      install -D -m644 /dev/stdin "${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"
   fi
 
   # remove build and source links
-- 
cgit v1.2.3