diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2023-07-11 10:21:44 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2023-07-11 10:25:35 -0400 |
| commit | 71cf29063b3a3fb9d7b548d7ed50d62f1e8845a5 (patch) | |
| tree | 86b4cca4b8e1f48bb1978b0a5726fb9127f02abf | |
| parent | sys-apps/fwupd: add 1.9.3 (diff) | |
| download | gentoo-71cf2906.tar.gz gentoo-71cf2906.tar.bz2 gentoo-71cf2906.zip | |
sys-boot/grub: fix grub.d/25_bli on split-usr
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch | 31 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.12_rc1-r1.ebuild (renamed from sys-boot/grub/grub-2.12_rc1.ebuild) | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch new file mode 100644 index 000000000000..6c5096d35e70 --- /dev/null +++ b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch @@ -0,0 +1,31 @@ +From f827aac60d760a026db642b9d5c1ecbf587cfefc Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +Date: Mon, 10 Jul 2023 23:55:43 -0500 +Subject: [PATCH] util/grub.d/25_bli.in: fix shebang on unmerged-usr + +On an unmerged-usr system, grub-mkconfig errors out with the following +error due to /usr/bin/sh not existing: + +/usr/sbin/grub-mkconfig: /etc/grub.d/25_bli: /usr/bin/sh: bad interpreter: No such file or directory + +Use a /bin/sh shebang to fix the error as well as match the other +existing files. + +Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com> +--- + util/grub.d/25_bli.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in +index 6e4538716..26e27a019 100644 +--- a/util/grub.d/25_bli.in ++++ b/util/grub.d/25_bli.in +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#! /bin/sh + set -e + + # grub-mkconfig helper script. +-- +2.41.0 + diff --git a/sys-boot/grub/grub-2.12_rc1.ebuild b/sys-boot/grub/grub-2.12_rc1-r1.ebuild index 96f3d98c6f01..ba4eb3b5a34b 100644 --- a/sys-boot/grub/grub-2.12_rc1.ebuild +++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild @@ -54,6 +54,7 @@ PATCHES=( "${FILESDIR}"/gfxpayload.patch "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch "${FILESDIR}"/grub-2.06-test-words.patch + "${FILESDIR}"/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch ) DEJAVU=dejavu-sans-ttf-2.37 |