mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-13 16:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-boot/grub: Sync with Gentoo

Browse Source 
It's from Gentoo commit 5062b137fe6cf107c6577d3d177e710bd0815554.
This commit is contained in:
Flatcar Buildbot 2025-02-25 12:34:41 +01:00 committed by Krzesimir Nowak
parent 8d762aff09
commit e9f7b94340
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-2.12-r5.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors # Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -25,8 +25,8 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools inherit autotools
fi fi
inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 inherit bash-completion-r1 eapi9-ver flag-o-matic multibuild optfeature
inherit secureboot toolchain-funcs inherit python-any-r1 secureboot toolchain-funcs
DESCRIPTION="GNU GRUB boot loader" DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/" HOMEPAGE="https://www.gnu.org/software/grub/"
@ -387,23 +387,17 @@ pkg_postinst() {
elog "For information on how to configure GRUB2 please refer to the guide:" elog "For information on how to configure GRUB2 please refer to the guide:"
elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
if [[ -n ${REPLACING_VERSIONS} ]]; then if [[ -z ${REPLACING_VERSIONS} ]]; then
local v
for v in ${REPLACING_VERSIONS}; do
if ver_test -gt ${v}; then
ewarn
ewarn "Re-run grub-install to update installed boot code!"
ewarn "Re-run grub-mkconfig to update grub.cfg!"
ewarn
break
fi
done
else
elog elog
optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]" 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 fi
if has_version 'sys-boot/grub:0'; then if has_version 'sys-boot/grub:0'; then

24
sdk_container/src/third_party/portage-stable/sys-boot/grub/grub-9999.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors # Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=7 EAPI=7
@ -29,8 +29,8 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools inherit autotools
fi fi
inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 inherit bash-completion-r1 eapi9-ver flag-o-matic multibuild optfeature
inherit secureboot toolchain-funcs inherit python-any-r1 secureboot toolchain-funcs
DESCRIPTION="GNU GRUB boot loader" DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/" HOMEPAGE="https://www.gnu.org/software/grub/"
@ -384,23 +384,17 @@ pkg_postinst() {
elog "For information on how to configure GRUB2 please refer to the guide:" elog "For information on how to configure GRUB2 please refer to the guide:"
elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start" elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
if [[ -n ${REPLACING_VERSIONS} ]]; then if [[ -z ${REPLACING_VERSIONS} ]]; then
local v
for v in ${REPLACING_VERSIONS}; do
if ver_test -gt ${v}; then
ewarn
ewarn "Re-run grub-install to update installed boot code!"
ewarn "Re-run grub-mkconfig to update grub.cfg!"
ewarn
break
fi
done
else
elog elog
optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]" 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 fi
if has_version 'sys-boot/grub:0'; then if has_version 'sys-boot/grub:0'; then