From f6aaf35ec25fe95410b13147f52b1b93b7ba34ac Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 19 Nov 2016 17:28:45 -0300 Subject: linux-libre-lts-knock-4.4.32_gnu-2: updating revision * fix lvm2 breakage, move to mkinitcpio running as pacman hook - FS#51818 -> https://bugs.archlinux.org/task/51818 * overhaul sed'ding --- kernels/linux-libre-lts-knock/PKGBUILD | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'kernels/linux-libre-lts-knock/PKGBUILD') diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index f40cf583e..9eae7d484 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -20,7 +20,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=2 rcnrel=armv7-x13 arch=('i686' 'x86_64' 'armv7h') url="https://gnunet.org/knock" @@ -44,6 +44,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' @@ -78,7 +80,8 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0' '7cbda7707e8edfd28658da3ef3f58f5b6314a483d45757a7b2375d1c0450eaa1' '1aa649f7e8001391effb6edc65c8d47bf189301f8cc35fc23515141d8cbca14c' '53b6d57b24bca3f54e40a72c7390fe939e3ea53ab89d88ad94df68846f2c40ac' - 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' + 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' 'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798' @@ -241,22 +244,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