diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2019-05-19 03:51:29 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-05-20 01:21:53 -0400 |
| commit | 98431c0f2cedd313389b7120917643d825381ba7 (patch) | |
| tree | 199d96a90b2f6d579674cbb6e7ecf084ceb7f6e5 | |
| parent | e7266032c929b0af6f9e8dd15d7ebaf2ec4916cd (diff) | |
[linux-libre][linux-libre-lts]: allow packaging with read-only startdir
* https://labs.parabola.nu/issues/2141
* https://lists.parabola.nu/pipermail/dev/2019-May/007207.html
| -rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/linux-libre-lts/linux-lts.install | 4 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/linux-libre/linux.install | 6 |
4 files changed, 5 insertions, 15 deletions
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 048b9028e..089760fa0 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -247,10 +247,6 @@ _package() { " fi - # hack to allow specifying an initially nonexisting install file - sed "${_subst}" "${startdir}/${install}" > "${startdir}/${install}.pkg" - true && install=${install}.pkg - # install mkinitcpio preset file sed "${_subst}" ../linux-lts.preset | install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" diff --git a/libre/linux-libre-lts/linux-lts.install b/libre/linux-libre-lts/linux-lts.install index f1f033b4e..cb31b9817 100644 --- a/libre/linux-libre-lts/linux-lts.install +++ b/libre/linux-libre-lts/linux-lts.install @@ -7,6 +7,6 @@ post_upgrade() { } post_remove() { - rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img + rm -f boot/initramfs-linux-libre-lts.img + rm -f boot/initramfs-linux-libre-lts-fallback.img } diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d890e2897..0124e5d52 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ # Based on linux package pkgbase=linux-libre # Build stock kernel -#pkgbase=linux-libre-custom # Build kernel with a different name +#pkgbase=linux-libre-custom # Build kernel with a different name (NOTE: hard-coded into linux.install) _srcbasever=5.1-gnu _srcver=5.1.3-gnu @@ -225,10 +225,6 @@ _package() { " fi - # hack to allow specifying an initially nonexisting install file - sed "$subst" "$startdir/$install" > "$startdir/$install.pkg" - true && install=$install.pkg - # fill in mkinitcpio preset and pacman hooks sed "$subst" ../linux.preset | install -Dm644 /dev/stdin \ "$pkgdir/etc/mkinitcpio.d/$pkgbase.preset" diff --git a/libre/linux-libre/linux.install b/libre/linux-libre/linux.install index 19a43a524..dc4440d29 100644 --- a/libre/linux-libre/linux.install +++ b/libre/linux-libre/linux.install @@ -7,8 +7,6 @@ post_upgrade() { } post_remove() { - rm -f boot/initramfs-%PKGBASE%.img - rm -f boot/initramfs-%PKGBASE%-fallback.img + rm -f boot/initramfs-linux-libre.img + rm -f boot/initramfs-linux-libre-fallback.img } - -# vim:set ft=sh ts=8 sts=2 sw=2 et: |