From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0B87E15800D for ; Tue, 11 Jul 2023 14:26:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE444E07EA; Tue, 11 Jul 2023 14:25:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE26EE07EA for ; Tue, 11 Jul 2023 14:25:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3BBD335C03 for ; Tue, 11 Jul 2023 14:25:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11330A9C for ; Tue, 11 Jul 2023 14:25:56 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1689085535.71cf29063b3a3fb9d7b548d7ed50d62f1e8845a5.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch sys-boot/grub/grub-2.12_rc1-r1.ebuild sys-boot/grub/grub-2.12_rc1.ebuild X-VCS-Directories: sys-boot/grub/ sys-boot/grub/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 71cf29063b3a3fb9d7b548d7ed50d62f1e8845a5 X-VCS-Branch: master Date: Tue, 11 Jul 2023 14:25:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ffe90af6-c532-4281-a152-91ef615df45b X-Archives-Hash: 94e4055ca394dfbb5ea639cfe564113a commit: 71cf29063b3a3fb9d7b548d7ed50d62f1e8845a5 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jul 11 14:21:44 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jul 11 14:25:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cf2906 sys-boot/grub: fix grub.d/25_bli on split-usr Signed-off-by: Mike Gilbert gentoo.org> ...b.d-25_bli.in-fix-shebang-on-unmerged-usr.patch | 31 ++++++++++++++++++++++ ...rub-2.12_rc1.ebuild => grub-2.12_rc1-r1.ebuild} | 1 + 2 files changed, 32 insertions(+) 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 +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 +--- + 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 similarity index 98% rename from sys-boot/grub/grub-2.12_rc1.ebuild rename to 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