From 9329ab4012d5fcb01347295ae56a7ac4946a5144 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 4 Mar 2017 17:05:43 -0300 Subject: linux-libre: fix mkinitcpio preset file for armv7h --- libre-testing/linux-libre/PKGBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libre-testing') diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD index 6ed33e2b5..cd56e595a 100644 --- a/libre-testing/linux-libre/PKGBUILD +++ b/libre-testing/linux-libre/PKGBUILD @@ -20,7 +20,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} -pkgrel=1 +pkgrel=1.1 rcnrel=armv7-x1 arch=('i686' 'x86_64' 'armv7h') url="https://linux-libre.fsfla.org/" @@ -211,8 +211,13 @@ _package() { true && install=${install}.pkg # install mkinitcpio preset file for kernel - sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | - install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + if [ "${CARCH}" = "armv7h" ]; then + sed "s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g" "${srcdir}/linux.preset" | + install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then + sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/linux.preset" | + install -D -m644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + fi # install pacman hook for initramfs regeneration sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" | -- cgit v1.2.3