From df785d1b66fce104fd4265235a770a968af48516 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 7 Oct 2024 07:08:02 +0000 Subject: [PATCH] sys-boot/grub: Sync with Gentoo It's from Gentoo commit 4e8bb601a7935dcc6191b0c9cad4e4a9ac94bab7. --- .../portage-stable/sys-boot/grub/grub-2.12-r4.ebuild | 2 +- .../portage-stable/sys-boot/grub/grub-2.12-r5.ebuild | 4 ++-- .../third_party/portage-stable/sys-boot/grub/grub-9999.ebuild | 4 ++-- .../src/third_party/portage-stable/sys-boot/grub/metadata.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r4.ebuild index be8779e57c..5fc413c46c 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r4.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r4.ebuild @@ -51,7 +51,7 @@ if [[ ${PV} != 9999 ]]; then S=${WORKDIR}/${P%_*} fi BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )" - KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r5.ebuild index b79c99dc94..2328a488d4 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r5.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r5.ebuild @@ -52,7 +52,7 @@ if [[ ${PV} != 9999 ]]; then S=${WORKDIR}/${P%_*} fi BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" @@ -74,7 +74,7 @@ SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) # Includes licenses for dejavu and unifont LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" SLOT="2/${PVR}" -IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" +IUSE="+device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh ) diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-9999.ebuild index 31db1cdb8e..a1ef3c91a7 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-9999.ebuild @@ -55,7 +55,7 @@ if [[ ${PV} != 9999 ]]; then S=${WORKDIR}/${P%_*} fi BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )" - KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" else inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git" @@ -75,7 +75,7 @@ SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) # Includes licenses for dejavu and unifont LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )" SLOT="2/${PVR}" -IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" +IUSE="+device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh ) diff --git a/sdk_container/src/third_party/portage-stable/sys-boot/grub/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-boot/grub/metadata.xml index a5ad32e2e7..c8fd5827d3 100644 --- a/sdk_container/src/third_party/portage-stable/sys-boot/grub/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-boot/grub/metadata.xml @@ -11,7 +11,7 @@ - Enable support for device-mapper from sys-fs/lvm2 + Enable support for devmapper. Required for LUKS or LVM volume detection. Build and install the efiemu runtimes