Commit 334c0bdf authored by Luca Giambonini's avatar Luca Giambonini

fix linux .preset substitution (sed)

parent 1b06e517
Pipeline #1088 passed with stages
in 20 minutes and 17 seconds
...@@ -3,7 +3,7 @@ pkgbase=linux ...@@ -3,7 +3,7 @@ pkgbase=linux
pkgname=('linux' 'linux-headers' 'linux-docs') pkgname=('linux' 'linux-headers' 'linux-docs')
pkgver=4.18.3 pkgver=4.18.3
_srcname=linux-$pkgver _srcname=linux-$pkgver
pkgrel=1 pkgrel=2
arch=('x86_64') arch=('x86_64')
url="https://www.kernel.org/" url="https://www.kernel.org/"
license=('GPL2') license=('GPL2')
...@@ -117,18 +117,19 @@ package_linux() { ...@@ -117,18 +117,19 @@ package_linux() {
" "
# hack to allow specifying an initially nonexisting install file # hack to allow specifying an initially nonexisting install file
sed "${_subst}" "${startdir}/${install}" > "${startdir}/${install}.pkg" sed "$subst" "$startdir/$install" > "$startdir/$install.pkg"
true && install=${install}.pkg true && install=$install.pkg
# install mkinitcpio preset file # fill in mkinitcpio preset and pacman hooks
sed "${_subst}" ../linux.preset | sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \
install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset"
sed "$subst" ../60-linux.hook | install -Dm644 /dev/stdin \
# install pacman hooks "$pkgdir/usr/share/libalpm/hooks/60-$pkgbase.hook"
sed "${_subst}" ../60-linux.hook | sed "$subst" ../90-linux.hook | install -Dm644 /dev/stdin \
install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook" "$pkgdir/usr/share/libalpm/hooks/90-$pkgbase.hook"
sed "${_subst}" ../90-linux.hook |
install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook" msg2 "Fixing permissions..."
chmod -Rc u=rwX,go=rX "$pkgdir"
} }
package_linux-headers() { package_linux-headers() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment