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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2D14158041 for ; Mon, 6 Sep 2021 03:00:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B471AE0829; Mon, 6 Sep 2021 03:00:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97617E0829 for ; Mon, 6 Sep 2021 03:00:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4AC4F340FB3 for ; Mon, 6 Sep 2021 03:00:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 830349B for ; Mon, 6 Sep 2021 03:00:30 +0000 (UTC) From: "Mike Frysinger" 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 Frysinger" Message-ID: <1630897140.5f689c2332fa0e6f89ffaf85fb17ae745e84d737.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch X-VCS-Directories: sys-boot/grub/files/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 5f689c2332fa0e6f89ffaf85fb17ae745e84d737 X-VCS-Branch: master Date: Mon, 6 Sep 2021 03:00:30 +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: 4fdd1688-4c06-47be-acb0-ca35cfee403c X-Archives-Hash: 8e3ea1205657c9bb740f471d6a5eda3a commit: 5f689c2332fa0e6f89ffaf85fb17ae745e84d737 Author: Mike Frysinger gentoo org> AuthorDate: Mon Sep 6 02:57:51 2021 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Sep 6 02:59:00 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f689c23 sys-boot/grub: fix custom kernel glob patch The variable export was missing which caused it to always be blank. Setting it in /etc/default/grub wouldn't work as /etc/grub.d/10_linux still wouldn't see it. Signed-off-by: Mike Frysinger gentoo.org> sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch index c66ee68dc8d..0d2b96d76c1 100644 --- a/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch +++ b/sys-boot/grub/files/grub-2.02_beta2-KERNEL_GLOBS.patch @@ -62,6 +62,13 @@ index 859b608..e5ac11d 100644 case "$machine" in i?86) GENKERNEL_ARCH="x86" ;; --- -2.3.0 - +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -252,6 +252,7 @@ + GRUB_BADRAM \ + GRUB_OS_PROBER_SKIP_LIST \ + GRUB_DISABLE_SUBMENU ++export GRUB_LINUX_KERNEL_GLOBS + + if test "x${grub_cfg}" != "x"; then + rm -f "${grub_cfg}.new"