commit: aa56df7d7b8d5a7cc5635978258d2921d4de1912 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Feb 12 02:42:49 2026 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Feb 12 02:43:38 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa56df7d
sys-boot/grub: drop 2.14_rc1-r4, 2.14 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-boot/grub/Manifest | 2 - .../grub/files/grub-2.14-revert-image-base.patch | 101 ----- ...grub-2.14_rc1-configure.ac-avoid-bashisms.patch | 46 --- sys-boot/grub/grub-2.14.ebuild | 447 --------------------- sys-boot/grub/grub-2.14_rc1-r4.ebuild | 447 --------------------- 5 files changed, 1043 deletions(-) diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 5549d9709569..57792944142f 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -6,8 +6,6 @@ DIST grub-2.12.tar.xz.sig 566 BLAKE2B 9b77fe53041b99f1196743aa6d9fc9c727b17c6512 DIST grub-2.14-lld-support.tar.xz 6828 BLAKE2B 586274c56558f4b782f6bbfa511549daea4497c95f279a4aa733fe77e1ed7ddf2ced2ce803df999425c6d30d4ad888573b2ee0e69b8b14ce8102c5606bb2a311 SHA512 89522a61c174a8cf0ae7183a93f2ca01da89ff5f251c2207195408064fa882353a919b3185c784958a0e28d79d037b409a4c58a0e97e803968fa2c8c615401f2 DIST grub-2.14.tar.xz 7725668 BLAKE2B 724bb430d8824bec39e6a025cf354a780b79260684c7c4e3d28beb08c8bee10d082a089fcb799f8f5eb6e83abcf8675fb7c5f5ddf443c5c0e61d6f180ee341af SHA512 5008e3b70072798d2b34301219fe174cc6bcfead40a9ab25fe32f30c62a392ffb7bf2eb629d481f4a6c19c2925324af3f08d7043e62623e746be2d8b3cbd1182 DIST grub-2.14.tar.xz.sig 566 BLAKE2B a26d44082a94b95efd13738a47dc37c33142f1d486b1643100c5e61f280464513679407c13ad3d362caf83ca63dc47ad0249a4291660dbc5aa47b739502cc6b5 SHA512 3087cc4c9abd4c16e5d57f3f9fcea83af471c1a5950d487ecb93908feac537df8720bc83854328891c46f26b202a16eadeec8d1ab343c6fe269986b6f9dd2de8 -DIST grub-2.14~rc1.tar.xz 7652220 BLAKE2B dededd47b4c29f1d8c6e92de78d8d90dd9fa661b5964af7033100fbd15c15e89e810db9c9127f84363425f586c3283ae4511c27f8bb69015b39582a10261a4a8 SHA512 d96e4c749caaa51393f037fd2e9d1837bef8b7b1c44655d86cdfc6447adf27bb4451fbb9e78b4846f3ee39102548b560b639f97dcf6f74563ee9afac60056c2e -DIST grub-2.14~rc1.tar.xz.sig 566 BLAKE2B eac34a1a513a818809162a4f827191902e933e95cf3775930a8bccb18b0eb052a8bc4175fd1ba89a8dda802951b3b758f18443c65be3f8268201fa07d93ed6ce SHA512 a67766234f8d075d50381c9b94513a41d9c4a5214e5f000f182069d3318695d13c10072030f74cdfc3dc72f98f4d90fc9133b005e0af11314c754072c12299ef DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b DIST unifont-17.0.02.pcf.gz 1357145 BLAKE2B 6043055b10273930454b95bea847f4cd9cbceb7fa5f4b903a92d1e05093ed8d36b0be6cdcc96089d910b3af9b826d8bc0491070d7af568801e829fb69238d787 SHA512 8c325b8f1b872ced2a8ceffa89ce81858c4c768562711610529ae0be488dc335e333f8674cad78fe9550de222247816c435b0079bc959e6e1caebf4c7ecd2faf DIST unifont-17.0.02.pcf.gz.sig 566 BLAKE2B b20c3b498862b5f652bea95ca240a279674de583b2f03dc0b9ee0bac46da2513d54ca8fdcacc222adf5360da6fe919060bf41d977335d7c11a1bf9407c84c99d SHA512 f31792427adf73c0cf16f890faa579fda5315cbc0c9ac17b4d19555255f49dbf89f6333012ce99fec9819252fd7b81e07a65a2cd0d3aa54a54ded8d7c50ac186 diff --git a/sys-boot/grub/files/grub-2.14-revert-image-base.patch b/sys-boot/grub/files/grub-2.14-revert-image-base.patch deleted file mode 100644 index 815d313deb95..000000000000 --- a/sys-boot/grub/files/grub-2.14-revert-image-base.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f0de21acceb48ab5303917b102a7b57a23dda775 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Sun, 18 Jan 2026 19:45:53 -0500 -Subject: [PATCH 1/2] Revert "configure: Print a more helpful error if - autoconf-archive is not installed" - -Reverts: ac042f3f58d33ce9cd5ff61750f06da1a1d7b0eb ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 47a96c36f..1919b8f52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1792,11 +1792,6 @@ LIBS="" - # Defined in acinclude.m4. - grub_ASM_USCORE - grub_PROG_TARGET_CC -- --# The error message produced by autoconf if autoconf-archive is not installed is --# quite misleading and not very helpful. So, try point people in the right direction. --m4_ifndef([AX_CHECK_LINK_FLAG], [m4_fatal([autoconf-archive is missing. You must install it to generate the configure script.])]) -- - if test "x$TARGET_APPLE_LINKER" != x1 ; then - AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000], - [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"], --- -2.52.0 - - -From b54f00dc03b6edeead907315cbb3ede1ad1411ff Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Sun, 18 Jan 2026 19:35:09 -0500 -Subject: [PATCH 2/2] Revert "configure: Check linker for --image-base support" - -Bug: https://bugs.gentoo.org/965424 -Reverts: 1a5417f39a0ccefcdd5440f2a67f84d2d2e26960 ---- - acinclude.m4 | 5 ----- - configure.ac | 14 ++------------ - 2 files changed, 2 insertions(+), 17 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 70c1912f8..fa7840f09 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -79,11 +79,6 @@ AC_DEFUN([grub_PROG_OBJCOPY_ABSOLUTE], - [AC_MSG_CHECKING([whether ${TARGET_OBJCOPY} works for absolute addresses]) - AC_CACHE_VAL(grub_cv_prog_objcopy_absolute, - [cat > conftest.c <<\EOF --asm ( -- ".globl start, _start, __start\n" -- ".ifdef cmain; .set start = _start = __start = cmain\n.endif\n" -- ".ifdef _cmain; .set start = _start = __start = _cmain\n.endif\n" --); - void cmain (void); - void - cmain (void) -diff --git a/configure.ac b/configure.ac -index 1919b8f52..0d693f8d1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1461,6 +1461,7 @@ elif test x$grub_cv_target_cc_link_format = x-mi386pe || test x$grub_cv_target_c - TARGET_IMG_LDSCRIPT='$(top_srcdir)'"/conf/i386-cygwin-img-ld.sc" - TARGET_IMG_LDFLAGS="-Wl,-T${TARGET_IMG_LDSCRIPT}" - TARGET_IMG_LDFLAGS_AC="-Wl,-T${srcdir}/conf/i386-cygwin-img-ld.sc" -+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext" - TARGET_IMG_CFLAGS= - else - TARGET_APPLE_LINKER=0 -@@ -1468,6 +1469,7 @@ else - TARGET_IMG_LDSCRIPT= - TARGET_IMG_LDFLAGS='-Wl,-N' - TARGET_IMG_LDFLAGS_AC='-Wl,-N' -+ TARGET_IMG_BASE_LDOPT="-Wl,-Ttext" - TARGET_IMG_CFLAGS= - fi - -@@ -1793,18 +1795,6 @@ LIBS="" - grub_ASM_USCORE - grub_PROG_TARGET_CC - if test "x$TARGET_APPLE_LINKER" != x1 ; then --AX_CHECK_LINK_FLAG([-Wl,--image-base,0x400000], -- [TARGET_IMG_BASE_LDOPT="-Wl,--image-base"], -- [TARGET_IMG_BASE_LDOPT="-Wl,-Ttext"], -- [], -- [AC_LANG_SOURCE([ --asm (".globl start; start:"); --asm (".globl _start; _start:"); --asm (".globl __start; __start:"); --void __main (void); --void __main (void) {} --int main (void); -- ])]) - grub_PROG_OBJCOPY_ABSOLUTE - fi - grub_PROG_LD_BUILD_ID_NONE --- -2.52.0 - diff --git a/sys-boot/grub/files/grub-2.14_rc1-configure.ac-avoid-bashisms.patch b/sys-boot/grub/files/grub-2.14_rc1-configure.ac-avoid-bashisms.patch deleted file mode 100644 index f25b94c99ed2..000000000000 --- a/sys-boot/grub/files/grub-2.14_rc1-configure.ac-avoid-bashisms.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/965315 - -From 5196d40b6ec6ad75e84ab98e9f4a3d71211f0d56 Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Thu, 30 Oct 2025 07:31:59 +0100 -Subject: [PATCH] configure.ac: avoid bashisms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -or else configure check doesn't succeed with non-bash shell (e.g. dash): - - checking whether to enable AMD64 as(1) feature detection... /var/tmp/portage/sys-boot/grub-2.14_rc1/work/grub-2.14~rc1/configure: 39176: test: xx86_64: unexpected operator - no - -and later build fails with - - /var/tmp/portage/sys-boot/grub-2.14_rc1/work/grub-2.14~rc1/grub-core/lib/libgcrypt-grub/src/hwf-x86.c: In function ‘detect_x86_gnuc’: - /var/tmp/portage/sys-boot/grub-2.14_rc1/work/grub-2.14~rc1/grub-core/lib/libgcrypt-grub/src/hwf-x86.c:252:17: error: ‘HWF_INTEL_CPU’ undeclared (first use in this function) - 252 | result |= HWF_INTEL_CPU; - | ^~~~~~~~~~~~~ - -and other corresponding HWF_INTEL_* definitions because HAVE_CPU_ARCH_X86 was -erroneously not defined by configure script. - -Signed-off-by: Lars Wendler <[email protected]> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8a72c078e..17937baf4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1150,7 +1150,7 @@ fi - - # Implementation of the --disable-amd64-as-feature-detection switch. - AC_MSG_CHECKING([whether to enable AMD64 as(1) feature detection]) --if test x$target_cpu == xx86_64 -a x$platform == xefi; then -+if test x$target_cpu = xx86_64 -a x$platform = xefi; then - CPPFLAGS_GCRY_ASM="-D__x86_64 -DHAVE_CPU_ARCH_X86" - AC_ARG_ENABLE(amd64-as-feature-detection, - AS_HELP_STRING([--disable-amd64-as-feature-detection], --- -2.51.1 - diff --git a/sys-boot/grub/grub-2.14.ebuild b/sys-boot/grub/grub-2.14.ebuild deleted file mode 100644 index 81047a7218a9..000000000000 --- a/sys-boot/grub/grub-2.14.ebuild +++ /dev/null @@ -1,447 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# This ebuild uses 3 special global variables: -# GRUB_BOOTSTRAP: Invoke bootstrap (gnulib) -# GRUB_AUTOGEN: Invoke autogen.sh -# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf -# -# When applying patches: -# If gnulib is updated, set GRUB_BOOTSTRAP=1 -# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1 -# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1 -# -# If any of the above applies to a user patch, the user should set the -# corresponding variable in make.conf or the environment. - -GRUB_AUTOGEN=1 -GRUB_AUTORECONF=1 - -PYTHON_COMPAT=( python3_{11..14} ) -WANT_LIBTOOL=none - -if [[ -n ${GRUB_AUTORECONF} ]]; then - inherit autotools -fi - -inherit bash-completion-r1 eapi9-ver flag-o-matic multibuild optfeature -inherit python-any-r1 secureboot toolchain-funcs verify-sig - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/"; - -MY_P=${P} -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI=" - https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz - verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig ) - " - S=${WORKDIR}/${MY_P} - else - SRC_URI=" - mirror://gnu/${PN}/${P}.tar.xz - verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) - " - S=${WORKDIR}/${P%_*} - fi - BDEPEND=" - verify-sig? ( - sec-keys/openpgp-keys-grub - sec-keys/openpgp-keys-unifont - ) - " - 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"; -fi - -DEJAVU_VER=2.37 -DEJAVU=dejavu-fonts-ttf-${DEJAVU_VER} -UNIFONT=unifont-17.0.02 -SRC_URI+=" - fonts? ( - mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz - verify-sig? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz.sig ) - ) - themes? ( https://downloads.sourceforge.net/project/dejavu/dejavu/${DEJAVU_VER}/${DEJAVU}.tar.bz2 ) -" - -# 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="+branding +device-mapper doc efiemu +fonts mount nls protect 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 ) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE=" - grub_platforms_coreboot? ( fonts ) - grub_platforms_qemu? ( fonts ) - grub_platforms_ieee1275? ( fonts ) - grub_platforms_loongson? ( fonts ) -" - -BDEPEND+=" - ${PYTHON_DEPS} - >=sys-devel/flex-2.5.35 - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - fonts? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - test? ( - app-admin/genromfs - app-alternatives/cpio - app-arch/lzop - app-emulation/qemu - dev-libs/libisoburn - sys-apps/miscfiles - sys-block/parted - sys-fs/squashfs-tools - ) - themes? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - truetype? ( virtual/pkgconfig ) -" -DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - grub_platforms_emu? ( - sdl? ( media-libs/libsdl2 ) - ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs:= ) - mount? ( sys-fs/fuse:3= ) - truetype? ( media-libs/freetype:2= ) - ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - protect? ( dev-libs/libtasn1:= ) -" -RDEPEND="${DEPEND} - branding? ( themes? ( >=sys-boot/grub-themes-gentoo-1.0-r1 ) ) - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !sys-boot/grub:0 - nls? ( sys-devel/gettext ) -" - -RESTRICT="!test? ( test ) test? ( userpriv )" - -QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*" -QA_PRESTRIPPED="usr/lib/grub/.*" -QA_MULTILIB_PATHS="usr/lib/grub/.*" -QA_WX_LOAD="usr/lib/grub/*" - -PATCHES=( - "${FILESDIR}/grub-2.14-revert-image-base.patch" -) - -pkg_setup() { - # skip python-any-r1_pkg_setup: python_setup is called in src_prepare - secureboot_pkg_setup -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - pushd "${P}" >/dev/null || die - local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"; - local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}") - git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" - git-r3_checkout "${GNULIB_URI}" gnulib - if use nls; then - sh linguas.sh || die - fi - popd >/dev/null || die - elif use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig} \ - "${BROOT}"/usr/share/openpgp-keys/grub.asc - fi - if use fonts && use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${UNIFONT}.pcf.gz{,.sig} \ - "${BROOT}"/usr/share/openpgp-keys/unifont.asc - fi - default -} - -src_prepare() { - default - - python_setup - - if [[ -n ${GRUB_BOOTSTRAP} ]]; then - eautopoint --force - AUTOPOINT=: AUTORECONF=: ./bootstrap --skip-po || die - elif [[ -n ${GRUB_AUTOGEN} ]]; then - FROM_BOOTSTRAP=1 ./autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - eautoreconf - fi -} - -grub_do() { - multibuild_foreach_variant run_in_build_dir "$@" -} - -grub_do_once() { - multibuild_for_best_variant run_in_build_dir "$@" -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi*) platform=efi ;; - xen-pvh) platform=xen_pvh ;; - xen*) platform=xen ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - case ${MULTIBUILD_VARIANT} in - *-32) - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=i386 - fi ;; - *-64) - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=x86_64 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - fi ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable protect grub-protect) - $(use_enable themes grub-themes) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - --enable-grub-emu-sdl=no - $(use_enable sdl grub-emu-sdl2) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use fonts; then - cp "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - fi - - if use themes; then - cp "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi - - local ECONF_SOURCE="${S}" - econf "${myeconfargs[@]}" -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # Workaround for bug 829165. - filter-ldflags -pie - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY RANLIB STRIP - tc-export BUILD_CC BUILD_PKG_CONFIG - - # Force configure to use flex & bison, bug 887211. - export LEX=flex - unset YACC - - MULTIBUILD_VARIANTS=() - local p - for p in "${GRUB_ALL_PLATFORMS[@]}"; do - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) - done - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) - grub_do grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; } - - grub_do emake - use doc && grub_do_once emake -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - local SANDBOX_WRITE=${SANDBOX_WRITE} - addwrite /dev - grub_do emake -j1 check -} - -grub_mkstandalone_secureboot() { - use secureboot || return - - if tc-is-cross-compiler; then - ewarn "USE=secureboot is not supported when cross-compiling." - ewarn "No standalone EFI executable will be built." - return 1 - fi - - local standalone_targets - - case ${CTARGET:-${CHOST}} in - i?86* | x86_64*) - use grub_platforms_efi-32 && standalone_targets+=( i386-efi ) - use grub_platforms_efi-64 && standalone_targets+=( x86_64-efi ) - ;; - arm* | aarch64*) - use grub_platforms_efi-32 && standalone_targets+=( arm-efi ) - use grub_platforms_efi-64 && standalone_targets+=( arm64-efi ) - ;; - riscv*) - use grub_platforms_efi-32 && standalone_targets+=( riscv32-efi ) - use grub_platforms_efi-64 && standalone_targets+=( riscv64-efi ) - ;; - ia64*) - use grub_platforms_efi-64 && standalone_targets+=( ia64-efi ) - ;; - loongarch64*) - use grub_platforms_efi-64 && standalone_targets+=( loongarch64-efi ) - ;; - esac - - if [[ ${#standalone_targets[@]} -eq 0 ]]; then - ewarn "USE=secureboot is enabled, but no suitable EFI target in GRUB_PLATFORMS." - ewarn "No standalone EFI executable will be built." - return 1 - fi - - local target mkstandalone_args - - # grub-mkstandalone embeds a config file, make this config file chainload - # a config file in the same directory grub is installed in. This requires - # pre-loading the part_gpt and part_msdos modules. - echo 'configfile ${cmdpath}/grub.cfg' > "${T}/grub.cfg" || die - for target in "${standalone_targets[@]}"; do - ebegin "Building standalone EFI executable for ${target}" - mkstandalone_args=( - --verbose - --directory="${ED}/usr/lib/grub/${target}" - --locale-directory="${ED}/usr/share/locale" - --format="${target}" - --modules="part_gpt part_msdos" - --sbat="${ED}/usr/share/grub/sbat.csv" - --output="${ED}/usr/lib/grub/grub-${target%-efi}.efi" - "boot/grub/grub.cfg=${T}/grub.cfg" - ) - - "${ED}/usr/bin/grub-mkstandalone" "${mkstandalone_args[@]}" - eend ${?} || die "grub-mkstandalone failed to build EFI executable" - done - - secureboot_auto_sign -} - -src_install() { - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" - - einstalldocs - - insinto /etc/default - newins "${FILESDIR}"/grub.default-4 grub - - if use branding && use themes ; then - sed -i -e 's:^#GRUB_THEME=.*$:GRUB_THEME="/boot/grub/themes/gentoo_glass/theme.txt":g' \ - "${ED}/etc/default/grub" || die - fi - - # https://bugs.gentoo.org/231935 - dostrip -x /usr/lib/grub - - sed -e "s/%PV%/${PV}/" "${FILESDIR}/sbat.csv" > "${T}/sbat.csv" || die - insinto /usr/share/grub - doins "${T}/sbat.csv" - - if use elibc_musl; then - # https://bugs.gentoo.org/900348 - QA_CONFIG_IMPL_DECL_SKIP=( re_{compile_pattern,match,search,set_syntax} ) - fi - - grub_mkstandalone_secureboot -} - -pkg_postinst() { - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"; - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober - optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools - optfeature "enabling RAID device detection" sys-fs/mdadm - optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]" - elif ver_replacing -lt ${PVR}; then - ewarn - ewarn "Re-run grub-install to update installed boot code!" - ewarn "Re-run grub-mkconfig to update grub.cfg!" - ewarn - fi - - if has_version sys-boot/os-prober; then - ewarn "Due to security concerns, os-prober is disabled by default." - ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it." - fi - - if grep -q GRUB_LINUX_KERNEL_GLOBS "${EROOT}"/etc/default/grub; then - ewarn "Support for GRUB_LINUX_KERNEL_GLOBS has been dropped." - ewarn "Ensure that your kernels are named appropriately or edit" - ewarn "/etc/grub.d/10_linux to compensate." - fi - - if use secureboot; then - elog - elog "The signed standalone grub EFI executable(s) are available in:" - elog " /usr/lib/grub/grub-<target>.efi(.signed)" - elog "These EFI executables should be copied to the usual location at:" - elog " ESP/EFI/Gentoo/grub<arch>.efi" - elog "Note that 'grub-install' does not install these images." - elog - elog "These standalone grub executables read the grub config file from" - elog "the grub.cfg in the same directory instead of the default" - elog "/boot/grub/grub.cfg. When sys-kernel/installkernel[grub] is used," - elog "the location of the grub.cfg may be overridden by setting the" - elog "GRUB_CFG environment variable:" - elog " GRUB_CFG=ESP/EFI/Gentoo/grub.cfg" - elog - fi -} diff --git a/sys-boot/grub/grub-2.14_rc1-r4.ebuild b/sys-boot/grub/grub-2.14_rc1-r4.ebuild deleted file mode 100644 index b999f4f2177f..000000000000 --- a/sys-boot/grub/grub-2.14_rc1-r4.ebuild +++ /dev/null @@ -1,447 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# This ebuild uses 3 special global variables: -# GRUB_BOOTSTRAP: Invoke bootstrap (gnulib) -# GRUB_AUTOGEN: Invoke autogen.sh -# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf -# -# When applying patches: -# If gnulib is updated, set GRUB_BOOTSTRAP=1 -# If gentpl.py or *.def is updated, set GRUB_AUTOGEN=1 -# If gnulib, gentpl.py, *.def, or any autotools files are updated, set GRUB_AUTORECONF=1 -# -# If any of the above applies to a user patch, the user should set the -# corresponding variable in make.conf or the environment. - -GRUB_AUTORECONF=1 -if [[ ${PV} == 9999 ]]; then - GRUB_BOOTSTRAP=1 -fi - -PYTHON_COMPAT=( python3_{11..14} ) -WANT_LIBTOOL=none - -if [[ -n ${GRUB_AUTORECONF} ]]; then - inherit autotools -fi - -inherit bash-completion-r1 eapi9-ver flag-o-matic multibuild optfeature -inherit python-any-r1 secureboot toolchain-funcs verify-sig - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/"; - -MY_P=${P} -if [[ ${PV} != 9999 ]]; then - if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then - # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860 - MY_P=${P/_/'~'} - SRC_URI=" - https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz - verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig ) - " - S=${WORKDIR}/${MY_P} - else - SRC_URI=" - mirror://gnu/${PN}/${P}.tar.xz - verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) - " - S=${WORKDIR}/${P%_*} - fi - BDEPEND=" - verify-sig? ( - sec-keys/openpgp-keys-grub - sec-keys/openpgp-keys-unifont - ) - " - 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"; -fi - -PATCHES=( - "${FILESDIR}"/gfxpayload.patch - "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch - "${FILESDIR}"/grub-2.06-test-words.patch - "${FILESDIR}"/grub-2.14_rc1-configure.ac-avoid-bashisms.patch -) - -DEJAVU_VER=2.37 -DEJAVU=dejavu-fonts-ttf-${DEJAVU_VER} -UNIFONT=unifont-17.0.02 -SRC_URI+=" - fonts? ( - mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz - verify-sig? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz.sig ) - ) - themes? ( https://downloads.sourceforge.net/project/dejavu/dejavu/${DEJAVU_VER}/${DEJAVU}.tar.bz2 ) -" - -# 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="+branding +device-mapper doc efiemu +fonts mount nls protect 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 ) -IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" - -REQUIRED_USE=" - grub_platforms_coreboot? ( fonts ) - grub_platforms_qemu? ( fonts ) - grub_platforms_ieee1275? ( fonts ) - grub_platforms_loongson? ( fonts ) -" - -BDEPEND+=" - ${PYTHON_DEPS} - >=sys-devel/flex-2.5.35 - sys-devel/bison - sys-apps/help2man - sys-apps/texinfo - fonts? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - test? ( - app-admin/genromfs - app-alternatives/cpio - app-arch/lzop - app-emulation/qemu - dev-libs/libisoburn - sys-apps/miscfiles - sys-block/parted - sys-fs/squashfs-tools - ) - themes? ( - media-libs/freetype:2 - virtual/pkgconfig - ) - truetype? ( virtual/pkgconfig ) -" -DEPEND=" - app-arch/xz-utils - >=sys-libs/ncurses-5.2-r5:0= - grub_platforms_emu? ( - sdl? ( media-libs/libsdl2 ) - ) - device-mapper? ( >=sys-fs/lvm2-2.02.45 ) - libzfs? ( sys-fs/zfs:= ) - mount? ( sys-fs/fuse:3= ) - truetype? ( media-libs/freetype:2= ) - ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) - protect? ( dev-libs/libtasn1:= ) -" -RDEPEND="${DEPEND} - branding? ( themes? ( >=sys-boot/grub-themes-gentoo-1.0-r1 ) ) - kernel_linux? ( - grub_platforms_efi-32? ( sys-boot/efibootmgr ) - grub_platforms_efi-64? ( sys-boot/efibootmgr ) - ) - !sys-boot/grub:0 - nls? ( sys-devel/gettext ) -" - -RESTRICT="!test? ( test ) test? ( userpriv )" - -QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*" -QA_PRESTRIPPED="usr/lib/grub/.*" -QA_MULTILIB_PATHS="usr/lib/grub/.*" -QA_WX_LOAD="usr/lib/grub/*" - -pkg_setup() { - : -} - -src_unpack() { - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - pushd "${P}" >/dev/null || die - local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"; - local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}") - git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}" - git-r3_checkout "${GNULIB_URI}" gnulib - popd >/dev/null || die - elif use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig} \ - "${BROOT}"/usr/share/openpgp-keys/grub.asc - fi - if use fonts && use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${UNIFONT}.pcf.gz{,.sig} \ - "${BROOT}"/usr/share/openpgp-keys/unifont.asc - fi - default -} - -src_prepare() { - default - - python_setup - - if [[ -n ${GRUB_BOOTSTRAP} ]]; then - eautopoint --force - AUTOPOINT=: AUTORECONF=: ./bootstrap || die - elif [[ -n ${GRUB_AUTOGEN} ]]; then - FROM_BOOTSTRAP=1 ./autogen.sh || die - fi - - if [[ -n ${GRUB_AUTORECONF} ]]; then - eautoreconf - fi -} - -grub_do() { - multibuild_foreach_variant run_in_build_dir "$@" -} - -grub_do_once() { - multibuild_for_best_variant run_in_build_dir "$@" -} - -grub_configure() { - local platform - - case ${MULTIBUILD_VARIANT} in - efi*) platform=efi ;; - xen-pvh) platform=xen_pvh ;; - xen*) platform=xen ;; - guessed) ;; - *) platform=${MULTIBUILD_VARIANT} ;; - esac - - case ${MULTIBUILD_VARIANT} in - *-32) - if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then - local CTARGET=i386 - fi ;; - *-64) - if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then - local CTARGET=x86_64 - local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}" - local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" - fi ;; - esac - - local myeconfargs=( - --disable-werror - --program-prefix= - --libdir="${EPREFIX}"/usr/lib - $(use_enable device-mapper) - $(use_enable mount grub-mount) - $(use_enable nls) - $(use_enable protect grub-protect) - $(use_enable themes grub-themes) - $(use_enable truetype grub-mkfont) - $(use_enable libzfs) - --enable-grub-emu-sdl=no - $(use_enable sdl grub-emu-sdl2) - ${platform:+--with-platform=}${platform} - - # Let configure detect this where supported - $(usex efiemu '' '--disable-efiemu') - ) - - if use fonts; then - cp "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - fi - - if use themes; then - cp "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die - fi - - local ECONF_SOURCE="${S}" - econf "${myeconfargs[@]}" -} - -src_configure() { - # Bug 508758. - replace-flags -O3 -O2 - - # Workaround for bug 829165. - filter-ldflags -pie - - # We don't want to leak flags onto boot code. - export HOST_CCASFLAGS=${CCASFLAGS} - export HOST_CFLAGS=${CFLAGS} - export HOST_CPPFLAGS=${CPPFLAGS} - export HOST_LDFLAGS=${LDFLAGS} - unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS - - tc-ld-disable-gold #439082 #466536 #526348 - export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}" - unset LDFLAGS - - tc-export CC NM OBJCOPY RANLIB STRIP - tc-export BUILD_CC BUILD_PKG_CONFIG - - # Force configure to use flex & bison, bug 887211. - export LEX=flex - unset YACC - - MULTIBUILD_VARIANTS=() - local p - for p in "${GRUB_ALL_PLATFORMS[@]}"; do - use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" ) - done - [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed ) - grub_do grub_configure -} - -src_compile() { - # Sandbox bug 404013. - use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; } - - grub_do emake - use doc && grub_do_once emake -C docs html -} - -src_test() { - # The qemu dependency is a bit complex. - # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform. - local SANDBOX_WRITE=${SANDBOX_WRITE} - addwrite /dev - grub_do emake -j1 check -} - -grub_mkstandalone_secureboot() { - use secureboot || return - - if tc-is-cross-compiler; then - ewarn "USE=secureboot is not supported when cross-compiling." - ewarn "No standalone EFI executable will be built." - return 1 - fi - - local standalone_targets - - case ${CTARGET:-${CHOST}} in - i?86* | x86_64*) - use grub_platforms_efi-32 && standalone_targets+=( i386-efi ) - use grub_platforms_efi-64 && standalone_targets+=( x86_64-efi ) - ;; - arm* | aarch64*) - use grub_platforms_efi-32 && standalone_targets+=( arm-efi ) - use grub_platforms_efi-64 && standalone_targets+=( arm64-efi ) - ;; - riscv*) - use grub_platforms_efi-32 && standalone_targets+=( riscv32-efi ) - use grub_platforms_efi-64 && standalone_targets+=( riscv64-efi ) - ;; - ia64*) - use grub_platforms_efi-64 && standalone_targets+=( ia64-efi ) - ;; - loongarch64*) - use grub_platforms_efi-64 && standalone_targets+=( loongarch64-efi ) - ;; - esac - - if [[ ${#standalone_targets[@]} -eq 0 ]]; then - ewarn "USE=secureboot is enabled, but no suitable EFI target in GRUB_PLATFORMS." - ewarn "No standalone EFI executable will be built." - return 1 - fi - - local target mkstandalone_args - - # grub-mkstandalone embeds a config file, make this config file chainload - # a config file in the same directory grub is installed in. This requires - # pre-loading the part_gpt and part_msdos modules. - echo 'configfile ${cmdpath}/grub.cfg' > "${T}/grub.cfg" || die - for target in "${standalone_targets[@]}"; do - ebegin "Building standalone EFI executable for ${target}" - mkstandalone_args=( - --verbose - --directory="${ED}/usr/lib/grub/${target}" - --locale-directory="${ED}/usr/share/locale" - --format="${target}" - --modules="part_gpt part_msdos" - --sbat="${ED}/usr/share/grub/sbat.csv" - --output="${ED}/usr/lib/grub/grub-${target%-efi}.efi" - "boot/grub/grub.cfg=${T}/grub.cfg" - ) - - "${ED}/usr/bin/grub-mkstandalone" "${mkstandalone_args[@]}" - eend ${?} || die "grub-mkstandalone failed to build EFI executable" - done - - secureboot_auto_sign -} - -src_install() { - grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" - use doc && grub_do_once emake -C docs install-html DESTDIR="${D}" - - einstalldocs - - insinto /etc/default - newins "${FILESDIR}"/grub.default-4 grub - - if use branding && use themes ; then - sed -i -e 's:^#GRUB_THEME=.*$:GRUB_THEME="/boot/grub/themes/gentoo_glass/theme.txt":g' \ - "${ED}/etc/default/grub" || die - fi - - # https://bugs.gentoo.org/231935 - dostrip -x /usr/lib/grub - - sed -e "s/%PV%/${PV}/" "${FILESDIR}/sbat.csv" > "${T}/sbat.csv" || die - insinto /usr/share/grub - doins "${T}/sbat.csv" - - if use elibc_musl; then - # https://bugs.gentoo.org/900348 - QA_CONFIG_IMPL_DECL_SKIP=( re_{compile_pattern,match,search,set_syntax} ) - fi - - grub_mkstandalone_secureboot -} - -pkg_postinst() { - elog "For information on how to configure GRUB2 please refer to the guide:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"; - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog - optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober - optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools - optfeature "enabling RAID device detection" sys-fs/mdadm - optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]" - elif ver_replacing -lt ${PVR}; then - ewarn - ewarn "Re-run grub-install to update installed boot code!" - ewarn "Re-run grub-mkconfig to update grub.cfg!" - ewarn - fi - - if has_version 'sys-boot/grub:0'; then - elog "A migration guide for GRUB Legacy users is available:" - elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"; - fi - - if has_version sys-boot/os-prober; then - ewarn "Due to security concerns, os-prober is disabled by default." - ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it." - fi - - if use secureboot; then - elog - elog "The signed standalone grub EFI executable(s) are available in:" - elog " /usr/lib/grub/grub-<target>.efi(.signed)" - elog "These EFI executables should be copied to the usual location at:" - elog " ESP/EFI/Gentoo/grub<arch>.efi" - elog "Note that 'grub-install' does not install these images." - elog - elog "These standalone grub executables read the grub config file from" - elog "the grub.cfg in the same directory instead of the default" - elog "/boot/grub/grub.cfg. When sys-kernel/installkernel[grub] is used," - elog "the location of the grub.cfg may be overridden by setting the" - elog "GRUB_CFG environment variable:" - elog " GRUB_CFG=ESP/EFI/Gentoo/grub.cfg" - elog - fi -}
