commit: f47f9ef78efcafdefc90c4c4151cb63fd3dd520e Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Dec 13 19:08:18 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Dec 13 19:08:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47f9ef7
Revert "sys-boot/grub: add 2.12-r8, 2.14_rc1-r2 with default-enabled Gentoo branding" Reverts: 1e1bce2e991a2d2ccc215b9802a6ba693a0145c0 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../grub/files/grub-2.14_rc1-gentootheme.patch | 37 -- .../grub/files/grub-2.14_rc1-themerecursive.patch | 45 --- sys-boot/grub/grub-2.12-r8.ebuild | 439 -------------------- sys-boot/grub/grub-2.14_rc1-r2.ebuild | 450 --------------------- sys-boot/grub/grub-9999.ebuild | 11 +- 5 files changed, 1 insertion(+), 981 deletions(-) diff --git a/sys-boot/grub/files/grub-2.14_rc1-gentootheme.patch b/sys-boot/grub/files/grub-2.14_rc1-gentootheme.patch deleted file mode 100644 index 10f5ffd0bcc7..000000000000 --- a/sys-boot/grub/files/grub-2.14_rc1-gentootheme.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c28e65bbe31d47663c546077670888d4c44e042c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> -Date: Tue, 18 Nov 2025 20:26:59 +0100 -Subject: [PATCH] Install the themes starfield *and* gentoo_glass by default -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch is clearly Gentoo-specific. - -Signed-off-by: Andreas K. Hüttel <[email protected]> ---- - util/grub-install-common.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index a913ee61c..7af7915fe 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -1082,10 +1082,11 @@ grub_install_copy_files (const char *src, - if (install_themes.is_default) - { - install_themes.is_default = 0; -- install_themes.n_entries = 1; -- install_themes.entries = xmalloc (2 * sizeof (install_themes.entries[0])); -+ install_themes.n_entries = 2; -+ install_themes.entries = xmalloc (3 * sizeof (install_themes.entries[0])); - install_themes.entries[0] = xstrdup ("starfield"); -- install_themes.entries[1] = NULL; -+ install_themes.entries[1] = xstrdup ("gentoo_glass"); -+ install_themes.entries[2] = NULL; - } - - if (grub_install_themes_directory) --- -2.51.0 - diff --git a/sys-boot/grub/files/grub-2.14_rc1-themerecursive.patch b/sys-boot/grub/files/grub-2.14_rc1-themerecursive.patch deleted file mode 100644 index 4d34363ba621..000000000000 --- a/sys-boot/grub/files/grub-2.14_rc1-themerecursive.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c0a83f8ae0f4dfddf4ef360385d61fef2860f9e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> -Date: Sat, 13 Dec 2025 19:15:58 +0100 -Subject: [PATCH] grub-install: Allow recursive copying of theme dirs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This should be upstreamed in some way. - -Signed-off-by: Andreas K. Hüttel <[email protected]> ---- - util/grub-install-common.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/util/grub-install-common.c b/util/grub-install-common.c -index a913ee61c..c1c3c5704 100644 ---- a/util/grub-install-common.c -+++ b/util/grub-install-common.c -@@ -803,13 +803,20 @@ copy_all (const char *srcd, - || strcmp (de->d_name, "..") == 0) - continue; - srcf = grub_util_path_concat (2, srcd, de->d_name); -- if (grub_util_is_special_file (srcf) -- || grub_util_is_directory (srcf)) -+ if (grub_util_is_special_file (srcf)) - { - free (srcf); - continue; - } - dstf = grub_util_path_concat (2, dstd, de->d_name); -+ if (grub_util_is_directory (srcf)) -+ { -+ grub_install_mkdir_p (dstf); -+ copy_all (srcf, dstf); -+ free (srcf); -+ free (dstf); -+ continue; -+ } - grub_install_compress_file (srcf, dstf, 1); - free (srcf); - free (dstf); --- -2.51.2 - diff --git a/sys-boot/grub/grub-2.12-r8.ebuild b/sys-boot/grub/grub-2.12-r8.ebuild deleted file mode 100644 index db623f82b32e..000000000000 --- a/sys-boot/grub/grub-2.12-r8.ebuild +++ /dev/null @@ -1,439 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# This ebuild uses 3 special global variables: -# GRUB_BOOTSTRAP: Depend on python and invoke bootstrap (gnulib). -# GRUB_AUTOGEN: Depend on python and 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_{10..13} ) -WANT_LIBTOOL=none -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/grub.asc - -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 - -DESCRIPTION="GNU GRUB boot loader" -HOMEPAGE="https://www.gnu.org/software/grub/"; - -MY_P=${P} -if [[ ${PV} != 9999 ]]; then - inherit verify-sig - - 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 - https://dev.gentoo.org/~floppym/dist/${P}-bash-completion.patch.gz - verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig ) - " - S=${WORKDIR}/${P%_*} - fi - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-grub )" - 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.12-fwsetup.patch - "${WORKDIR}"/grub-2.12-bash-completion.patch - "${FILESDIR}"/grub-2.12-zfs-zstd-compression-support.patch -) - -DEJAVU=dejavu-sans-ttf-2.37 -UNIFONT=unifont-15.0.06 -SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) - themes? ( https://downloads.sourceforge.net/dejavu/${DEJAVU}.zip )" - -# 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 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? ( - app-arch/unzip - 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 ) -" -RDEPEND="${DEPEND} - branding? ( sys-boot/grub-themes-gentoo ) - 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} - fi - default -} - -src_prepare() { - default - - if use branding ; then - eapply "${FILESDIR}/${PN}-2.14_rc1-gentootheme.patch" - fi - - 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 - - # Avoid error due to extra_deps.lst missing from source tarball: - # make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop. - echo "depends bli part_gpt" > grub-core/extra_deps.lst || die -} - -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 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 - ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - fi - - if use themes; then - ln -rs "${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 -e 's:^#GRUB_THEME=.*$:GRUB_THEME="/boot/grub/themes/gentoo_glass/theme.txt":g' -i "${D}/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 -} diff --git a/sys-boot/grub/grub-2.14_rc1-r2.ebuild b/sys-boot/grub/grub-2.14_rc1-r2.ebuild deleted file mode 100644 index f454209ef839..000000000000 --- a/sys-boot/grub/grub-2.14_rc1-r2.ebuild +++ /dev/null @@ -1,450 +0,0 @@ -# Copyright 1999-2025 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? ( sys-boot/grub-themes-gentoo ) - 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 - - if use branding ; then - eapply "${FILESDIR}/${PN}-2.14_rc1-gentootheme.patch" - eapply "${FILESDIR}/${PN}-2.14_rc1-themerecursive.patch" - fi - - 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 -e 's:^#GRUB_THEME=.*$:GRUB_THEME="/boot/grub/themes/gentoo_glass/theme.txt":g' -i "${D}/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 -} diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 161ad8b199fb..308c002858b0 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -77,7 +77,7 @@ SRC_URI+=" # 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" +IUSE="+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 ) @@ -131,7 +131,6 @@ DEPEND=" protect? ( dev-libs/libtasn1:= ) " RDEPEND="${DEPEND} - branding? ( sys-boot/grub-themes-gentoo ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) @@ -175,11 +174,6 @@ src_unpack() { src_prepare() { default - if use branding ; then - eapply "${FILESDIR}/${PN}-2.14_rc1-gentootheme.patch" - eapply "${FILESDIR}/${PN}-2.14_rc1-themerecursive.patch" - fi - python_setup if [[ -n ${GRUB_BOOTSTRAP} ]]; then @@ -379,9 +373,6 @@ src_install() { insinto /etc/default newins "${FILESDIR}"/grub.default-4 grub - if use branding && use themes ; then - sed -e 's:^#GRUB_THEME=.*$:GRUB_THEME="/boot/grub/themes/gentoo_glass/theme.txt":g' -i "${D}/etc/default/grub" || die - fi # https://bugs.gentoo.org/231935 dostrip -x /usr/lib/grub
