[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: fe420281b87aaf017e0bf6d201184c1fa977b9a6
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Apr 30 18:44:58 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Apr 30 18:46:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe420281
sys-boot/grub: depend on python unconditionally
configure calls PYTHON in a couple of places, so we need python even if
we are not regenerating the build system.
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.12-r4.ebuild | 12 ++--
sys-boot/grub/grub-.ebuild| 12 ++--
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r4.ebuild
b/sys-boot/grub/grub-2.12-r4.ebuild
index 9755d0e4ee49..66b37086f92f 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -21,15 +21,11 @@ PYTHON_COMPAT=( python3_{10..12} )
WANT_LIBTOOL=none
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1
toolchain-funcs
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/;
@@ -168,11 +164,7 @@ src_prepare() {
default
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
+ python_setup
if [[ -n ${GRUB_BOOTSTRAP} ]]; then
eautopoint --force
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 3e36233d4ef0..1061d6ebe58d 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -25,15 +25,11 @@ PYTHON_COMPAT=( python3_{10..12} )
WANT_LIBTOOL=none
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1
toolchain-funcs
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/;
@@ -169,11 +165,7 @@ src_prepare() {
default
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
+ python_setup
if [[ -n ${GRUB_BOOTSTRAP} ]]; then
eautopoint --force
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 3857c12049e8ef49544d910fa355acd70733043e
Author: Mike Gilbert gentoo org>
AuthorDate: Sat Apr 13 14:51:32 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat Apr 13 14:51:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3857c120
sys-boot/grub: enable py3.12
Closes: https://bugs.gentoo.org/929829
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.12-r4.ebuild | 2 +-
sys-boot/grub/grub-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r4.ebuild
b/sys-boot/grub/grub-2.12-r4.ebuild
index fe97c8b890c1..4be3b08984b6 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -17,7 +17,7 @@ EAPI=7
# corresponding variable in make.conf or the environment.
GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
WANT_LIBTOOL=none
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index cbeeb45ebfb4..688a7f51bb8a 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == ]]; then
GRUB_BOOTSTRAP=1
fi
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
WANT_LIBTOOL=none
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: 597323aae87e1857d2c048dde3450e3c3c0c92c7
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 11 19:39:11 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 11 19:40:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597323aa
sys-boot/grub: add workaround for fwsetup issue
Bug: https://bugs.gentoo.org/925370
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/files/grub-2.12-fwsetup.patch| 38 ++
.../{grub-2.12-r3.ebuild => grub-2.12-r4.ebuild} | 1 +
2 files changed, 39 insertions(+)
diff --git a/sys-boot/grub/files/grub-2.12-fwsetup.patch
b/sys-boot/grub/files/grub-2.12-fwsetup.patch
new file mode 100644
index ..d328d3f110ae
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.12-fwsetup.patch
@@ -0,0 +1,38 @@
+From 6e0b2277eba062bf7950536cd27f9789c545d20f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Thu, 11 Apr 2024 15:33:45 -0400
+Subject: [PATCH] grub.d: avoid calling fwsetup unconditionally
+
+This causes grub to enter the firmware setup on boot when using a
+grub core that does not support the 'fwsetup --is-supported' option.
+
+Upstream has rejected attempts to resolve this, so we will carry this as
+a distro patch for a bit.
+
+Bug: https://bugs.gentoo.org/925370
+---
+ util/grub.d/30_uefi-firmware.in | 9 +++--
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
+index 1c2365ddb..b6041b55e 100644
+--- a/util/grub.d/30_uefi-firmware.in
b/util/grub.d/30_uefi-firmware.in
+@@ -32,11 +32,8 @@ gettext_printf "Adding boot menu entry for UEFI Firmware
Settings ...\n" >&2
+
+ cat << EOF
+ if [ "\$grub_platform" = "efi" ]; then
+- fwsetup --is-supported
+- if [ "\$?" = 0 ]; then
+- menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
+- fwsetup
+- }
+- fi
++ menuentry '$LABEL' \$menuentry_id_option 'uefi-firmware' {
++ fwsetup
++ }
+ fi
+ EOF
+--
+2.44.0
+
diff --git a/sys-boot/grub/grub-2.12-r3.ebuild
b/sys-boot/grub/grub-2.12-r4.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.12-r3.ebuild
rename to sys-boot/grub/grub-2.12-r4.ebuild
index cfeaf9fca9f8..fe97c8b890c1 100644
--- a/sys-boot/grub/grub-2.12-r3.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -162,6 +162,7 @@ src_prepare() {
"${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
)
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: fc242244bc7ce0e280091846adb5a8f3ebbafdd7
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 4 20:35:16 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 4 20:35:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc242244
sys-boot/grub: drop 2.06-r9
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 4 -
sys-boot/grub/grub-2.06-r9.ebuild | 352 --
2 files changed, 356 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 94cdb691a530..03be6d621874 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,9 +1,5 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.06-backports-r3.tar.xz 47612 BLAKE2B
235610e826c7a76d05872fb51e74564fb3861590f95377d5dcb9a5a4b0f5037d0b71c9f334bfe0bbe399f65036088d808f7af8e43090007ab7394002d05f7b4a
SHA512
561f031dca2cdc13fc1b3f3cfdbdccd7decd67ef18ddcc588327f141b026eadcda5d64d729929859cad54959b3855ff86c1f62e3ff1d8ae5f6f5ac5761fa6ba4
-DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
-DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
DIST grub-2.12-bash-completion.patch.gz 3627 BLAKE2B
6ba80fd4fb4b28ae2e5a2387133d815da126a4eaa4b5cb24b13f4ba5a2499ab4099d10ada366ed39f84be2c38774122f48e1a1894768c5bee29149528610d095
SHA512
a9ee6d2253ae48d7f90907a9e975a3a1d01346bc621d8b8cddf7cc815cd91e078f6c61392724d13556ee64f099fa15c94fcb88a49ff02d4a90ebd376252cea5c
DIST grub-2.12.tar.xz 6675608 BLAKE2B
a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431
SHA512
761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
DIST grub-2.12.tar.xz.sig 566 BLAKE2B
9b77fe53041b99f1196743aa6d9fc9c727b17c6512129bab2b35005f2c70f371e30521ddd804bf0c666e36cf2667247980f385ca1ac911fa9b8e0311427dc01c
SHA512
fbe971d8c382578b49d33902234edd9cbd084b70820a1a56a59df4ec30874c0dd4fe27f8dc44bb380716bb7480ca68a87d120a25b92a6a10ff6c8ec1b60548d3
-DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B
81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca
SHA512
0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
deleted file mode 100644
index adeb7f089446..
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2024 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.
-
-if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTOGEN=1
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{8..11} )
-WANT_LIBTOOL=none
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
-
-MY_P=${P}
-if [[ ${PV} != ]]; then
- if [[ ${PV} ==
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: df4705e9a2a76f5d77e7eb0f43f807b0fc3a946c
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 4 20:34:52 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 4 20:34:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4705e9
sys-boot/grub: fix pkgcheck warnings
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.12-r3.ebuild | 8
sys-boot/grub/grub-.ebuild| 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r3.ebuild
b/sys-boot/grub/grub-2.12-r3.ebuild
index 6e37cfa21725..cfeaf9fca9f8 100644
--- a/sys-boot/grub/grub-2.12-r3.ebuild
+++ b/sys-boot/grub/grub-2.12-r3.ebuild
@@ -31,6 +31,9 @@ fi
inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/;
+
MY_P=${P}
if [[ ${PV} != ]]; then
inherit verify-sig
@@ -46,7 +49,7 @@ if [[ ${PV} != ]]; then
else
SRC_URI="
mirror://gnu/${PN}/${P}.tar.xz
-
https://dev.gentoo.org/~floppym/dist/grub-2.12-bash-completion.patch.gz
+
https://dev.gentoo.org/~floppym/dist/${P}-bash-completion.patch.gz
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
"
S=${WORKDIR}/${P%_*}
@@ -63,9 +66,6 @@ UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/;
-
# 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}"
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index bfd0dd40817c..cbeeb45ebfb4 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -35,6 +35,9 @@ fi
inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/;
+
MY_P=${P}
if [[ ${PV} != ]]; then
inherit verify-sig
@@ -66,9 +69,6 @@ UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/;
-
# 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}"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 1a1bb5562a181e4c897d0425f2e51edb5230636d
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 4 20:30:10 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 4 20:30:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1bb556
sys-boot/grub: backport bash-completion fix
Closes: https://bugs.gentoo.org/526138
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/{grub-2.12-r2.ebuild => grub-2.12-r3.ebuild} | 8 +++-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 2e9f525e6c20..94cdb691a530 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -2,6 +2,7 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aea
DIST grub-2.06-backports-r3.tar.xz 47612 BLAKE2B
235610e826c7a76d05872fb51e74564fb3861590f95377d5dcb9a5a4b0f5037d0b71c9f334bfe0bbe399f65036088d808f7af8e43090007ab7394002d05f7b4a
SHA512
561f031dca2cdc13fc1b3f3cfdbdccd7decd67ef18ddcc588327f141b026eadcda5d64d729929859cad54959b3855ff86c1f62e3ff1d8ae5f6f5ac5761fa6ba4
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
+DIST grub-2.12-bash-completion.patch.gz 3627 BLAKE2B
6ba80fd4fb4b28ae2e5a2387133d815da126a4eaa4b5cb24b13f4ba5a2499ab4099d10ada366ed39f84be2c38774122f48e1a1894768c5bee29149528610d095
SHA512
a9ee6d2253ae48d7f90907a9e975a3a1d01346bc621d8b8cddf7cc815cd91e078f6c61392724d13556ee64f099fa15c94fcb88a49ff02d4a90ebd376252cea5c
DIST grub-2.12.tar.xz 6675608 BLAKE2B
a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431
SHA512
761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
DIST grub-2.12.tar.xz.sig 566 BLAKE2B
9b77fe53041b99f1196743aa6d9fc9c727b17c6512129bab2b35005f2c70f371e30521ddd804bf0c666e36cf2667247980f385ca1ac911fa9b8e0311427dc01c
SHA512
fbe971d8c382578b49d33902234edd9cbd084b70820a1a56a59df4ec30874c0dd4fe27f8dc44bb380716bb7480ca68a87d120a25b92a6a10ff6c8ec1b60548d3
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r3.ebuild
similarity index 98%
rename from sys-boot/grub/grub-2.12-r2.ebuild
rename to sys-boot/grub/grub-2.12-r3.ebuild
index 54a9499e073d..6e37cfa21725 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r3.ebuild
@@ -16,11 +16,7 @@ EAPI=7
# If any of the above applies to a user patch, the user should set the
# corresponding variable in make.conf or the environment.
-if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
+GRUB_AUTORECONF=1
PYTHON_COMPAT=( python3_{9..11} )
WANT_LIBTOOL=none
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
@@ -50,6 +46,7 @@ if [[ ${PV} != ]]; then
else
SRC_URI="
mirror://gnu/${PN}/${P}.tar.xz
+
https://dev.gentoo.org/~floppym/dist/grub-2.12-bash-completion.patch.gz
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
"
S=${WORKDIR}/${P%_*}
@@ -165,6 +162,7 @@ src_prepare() {
"${FILESDIR}"/gfxpayload.patch
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
"${FILESDIR}"/grub-2.06-test-words.patch
+ "${WORKDIR}"/grub-2.12-bash-completion.patch
)
default
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 6133b41226d1ec047cc80c01599a9eca55cd065f
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 4 20:14:52 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 4 20:30:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6133b412
sys-boot/grub: move PATCHES to src_prepare
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 12 ++--
sys-boot/grub/grub-.ebuild| 12 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
index ab82c2a1831d..54a9499e073d 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -61,12 +61,6 @@ else
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
-)
-
DEJAVU=dejavu-sans-ttf-2.37
UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -167,6 +161,12 @@ src_unpack() {
}
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/grub-2.06-test-words.patch
+ )
+
default
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 44bb51e767ee..bfd0dd40817c 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -61,12 +61,6 @@ else
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
-)
-
DEJAVU=dejavu-sans-ttf-2.37
UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -167,6 +161,12 @@ src_unpack() {
}
src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/grub-2.06-test-words.patch
+ )
+
default
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: be90a8faa24f70e62d8435a4d5cee66fdc208374
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Mar 27 18:53:12 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Mar 27 18:53:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be90a8fa
sys-boot/grub: Stabilize 2.12-r2 arm64, #922889
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
index 4e7a366f5d1c..ab82c2a1831d 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 8bcf8e87210956b638bf3961d2825609e66963ff
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Mar 27 18:45:51 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Mar 27 18:51:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bcf8e87
sys-boot/grub: Stabilize 2.12-r2 sparc, #922889
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
index db94e641ab0d..4e7a366f5d1c 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 1131751a6c75e5245d75871ee863a86185872f3b
Author: Sam James gentoo org>
AuthorDate: Wed Mar 13 00:53:08 2024 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 13 00:53:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1131751a
sys-boot/grub: Stabilize 2.12-r2 arm, #922889
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
index c17033948a37..db94e641ab0d 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 09f22f3a8fbd81464e3d120ee37f48e3fcdae14d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 2 11:04:08 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 2 11:04:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09f22f3a
sys-boot/grub: Stabilize 2.12-r2 ppc, #922889
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
index 0929aaa5f508..c17033948a37 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 9044b19a1dae386ac4638d4833272809608aab37
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 2 10:57:49 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 2 10:57:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9044b19a
sys-boot/grub: Stabilize 2.12-r2 ppc64, #922889
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r2.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
index e156b1b4754a..0929aaa5f508 100644
--- a/sys-boot/grub/grub-2.12-r2.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/, sys-boot/grub/
commit: f879895488b938b704ebbde3f444df3d3cce8a0a
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Fri Mar 1 15:32:13 2024 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Fri Mar 1 16:58:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8798954
sys-boot/grub: install an sbat for grub-install --sbat ...
Booting with sys-boot/shim requires that an sbat section is present in
the EFI executable. Add an sbat.csv file that can optionally be
included when building the grub EFI executable.
Closes: https://bugs.gentoo.org/925902
Signed-off-by: Andrew Ammerlaan gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35588
Signed-off-by: Andrew Ammerlaan gentoo.org>
sys-boot/grub/files/sbat.csv | 3 +++
sys-boot/grub/{grub-2.12-r1.ebuild => grub-2.12-r2.ebuild} | 4
sys-boot/grub/grub-.ebuild | 4
3 files changed, 11 insertions(+)
diff --git a/sys-boot/grub/files/sbat.csv b/sys-boot/grub/files/sbat.csv
new file mode 100644
index ..2b87b532556c
--- /dev/null
+++ b/sys-boot/grub/files/sbat.csv
@@ -0,0 +1,3 @@
+sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
+grub,3,Free Software Foundation,grub,%PV%,https//www.gnu.org/software/grub/
+grub.gentoo,1,Gentoo,grub,%PV%,https://bugs.gentoo.org/
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r2.ebuild
similarity index 98%
rename from sys-boot/grub/grub-2.12-r1.ebuild
rename to sys-boot/grub/grub-2.12-r2.ebuild
index c6cb75fc4b02..e156b1b4754a 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r2.ebuild
@@ -315,6 +315,10 @@ src_install() {
# 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} )
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 0ba8261571a5..44bb51e767ee 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -311,6 +311,10 @@ src_install() {
# 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} )
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e108e12bce523c297c84cfd47d4e1b8cea08cca6
Author: Sam James gentoo org>
AuthorDate: Thu Feb 15 23:49:27 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 15 23:49:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e108e12b
sys-boot/grub: Stabilize 2.12-r1 amd64, #922889
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.12-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r1.ebuild
index 4cfcc97a992b..c6cb75fc4b02 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 19766b9cc2711165936811be968b6d25c2dd7e65
Author: Sam James gentoo org>
AuthorDate: Tue Feb 6 22:32:11 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 6 22:32:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19766b9c
sys-boot/grub: Stabilize 2.12-r1 x86, #922889
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.12-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r1.ebuild
index 4841cdc866db..4cfcc97a992b 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -55,7 +55,7 @@ if [[ ${PV} != ]]; 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 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 46792ce3aca3b580570625dc340631f08aed998c
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Feb 4 03:18:12 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Feb 4 03:19:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46792ce3
sys-boot/grub: ignore implicit re_match
Closes: https://bugs.gentoo.org/923736
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 2 +-
sys-boot/grub/grub-2.12-r1.ebuild | 2 +-
sys-boot/grub/grub-.ebuild| 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
index 1e41a5ab1fc2..adeb7f089446 100644
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -313,7 +313,7 @@ src_install() {
if use elibc_musl; then
# https://bugs.gentoo.org/900348
- QA_CONFIG_IMPL_DECL_SKIP=( re_set_syntax re_compile_pattern
re_search )
+ QA_CONFIG_IMPL_DECL_SKIP=(
re_{compile_pattern,match,search,set_syntax} )
fi
}
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r1.ebuild
index 036d1f5670fa..4841cdc866db 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -317,7 +317,7 @@ src_install() {
if use elibc_musl; then
# https://bugs.gentoo.org/900348
- QA_CONFIG_IMPL_DECL_SKIP=( re_set_syntax re_compile_pattern
re_search )
+ QA_CONFIG_IMPL_DECL_SKIP=(
re_{compile_pattern,match,search,set_syntax} )
fi
}
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 1a4cfde422a0..0ba8261571a5 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -313,7 +313,7 @@ src_install() {
if use elibc_musl; then
# https://bugs.gentoo.org/900348
- QA_CONFIG_IMPL_DECL_SKIP=( re_set_syntax re_compile_pattern
re_search )
+ QA_CONFIG_IMPL_DECL_SKIP=(
re_{compile_pattern,match,search,set_syntax} )
fi
}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 40be04df7f4b954a8bf48d211e0961567fa4c378
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Tue Jan 30 12:50:18 2024 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Fri Feb 2 06:16:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40be04df
sys-boot/grub: add installkernel as optfeature
Signed-off-by: Andrew Ammerlaan gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 1 +
sys-boot/grub/grub-2.12-r1.ebuild | 1 +
sys-boot/grub/grub-.ebuild| 1 +
3 files changed, 3 insertions(+)
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
index 31dc1e97ca87..1e41a5ab1fc2 100644
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -337,6 +337,7 @@ pkg_postinst() {
optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
optfeature "enabling RAID device detection" sys-fs/mdadm
+ optfeature "automatically updating GRUB's configuration on each
kernel installation" "sys-kernel/installkernel[grub]"
fi
if has_version 'sys-boot/grub:0'; then
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r1.ebuild
index 95e5fdb5c08e..036d1f5670fa 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -341,6 +341,7 @@ pkg_postinst() {
optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
optfeature "enabling RAID device detection" sys-fs/mdadm
+ optfeature "automatically updating GRUB's configuration on each
kernel installation" "sys-kernel/installkernel[grub]"
fi
if has_version 'sys-boot/grub:0'; then
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 4146c10c16ea..1a4cfde422a0 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -337,6 +337,7 @@ pkg_postinst() {
optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
optfeature "enabling RAID device detection" sys-fs/mdadm
+ optfeature "automatically updating GRUB's configuration on each
kernel installation" "sys-kernel/installkernel[grub]"
fi
if has_version 'sys-boot/grub:0'; then
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
commit: d3c252b3084f40c4d840283cfb448263afbf9ed2
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Jan 20 08:20:40 2024 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sat Jan 20 21:21:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c252b3
sys-boot/grub: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
...grub-2.06-arm64-linux-Remove-magic-number.patch | 45 --
.../grub-2.06-fs-ext2-ignore-checksum-seed.patch | 62
...py-Remove-.interp-section-from-.img-files.patch | 31 --
.../grub-2.06-grub-mkconfig-restore-umask.patch| 41 -
sys-boot/grub/files/grub-2.06-locale.patch | 68 --
sys-boot/grub/files/grub-2.06-riscv.patch | 49
...b.d-25_bli.in-fix-shebang-on-unmerged-usr.patch | 31 --
7 files changed, 327 deletions(-)
diff --git
a/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
b/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
deleted file mode 100644
index eed3bf0ca93d..
--- a/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://git.savannah.gnu.org/cgit/grub.git/patch/?id=69edb31205602c29293a8c6e67363bba2a4a1e66
-https://bugs.gentoo.org/913935
-
-From 69edb31205602c29293a8c6e67363bba2a4a1e66 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel
-Date: Thu, 11 Aug 2022 16:51:57 +0200
-Subject: loader/arm64/linux: Remove magic number header field check
-
-The "ARM\x64" magic number in the file header identifies an image as one
-that implements the bare metal boot protocol, allowing the loader to
-simply move the file to a suitably aligned address in memory, with
-sufficient headroom for the trailing .bss segment (the required memory
-size is described in the header as well).
-
-Note of this matters for GRUB, as it only supports EFI boot. EFI does
-not care about this magic number, and nor should GRUB: this prevents us
-from booting other PE linux images, such as the generic EFI zboot
-decompressor, which is a pure PE/COFF image, and does not implement the
-bare metal boot protocol.
-
-So drop the magic number check.
-
-Signed-off-by: Ard Biesheuvel
-Reviewed-by: Daniel Kiper
- grub-core/loader/arm64/linux.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index ef3e9f9..4c92e48 100644
a/grub-core/loader/arm64/linux.c
-+++ b/grub-core/loader/arm64/linux.c
-@@ -51,9 +51,6 @@ static grub_addr_t initrd_end;
- grub_err_t
- grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
- {
-- if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
--return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
--
- if ((lh->code0 & 0x) != GRUB_PE32_MAGIC)
- return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
- N_("plain image kernel not supported - rebuild with
CONFIG_(U)EFI_STUB enabled"));
---
-cgit v1.1
-
diff --git a/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
b/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
deleted file mode 100644
index 9024b479a878..
--- a/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/894200
-https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
-
-From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001
-From: Javier Martinez Canillas
-Date: Fri, 11 Jun 2021 21:36:16 +0200
-Subject: fs/ext2: Ignore checksum seed incompat feature
-
-This incompat feature is used to denote that the filesystem stored its
-metadata checksum seed in the superblock. This is used to allow tune2fs
-changing the UUID on a mounted metdata_csum filesystem without having
-to rewrite all the disk metadata. However, the GRUB doesn't use the
-metadata checksum at all. So, it can just ignore this feature if it
-is enabled. This is consistent with the GRUB filesystem code in general
-which just does a best effort to access the filesystem's data.
-
-The checksum seed incompat feature has to be removed from the ignore
-list if the support for metadata checksum verification is added to the
-GRUB ext2 driver later.
-
-Suggested-by: Eric Sandeen
-Suggested-by: Lukas Czerner
-Signed-off-by: Javier Martinez Canillas
-Reviewed-by: Lukas Czerner
-Reviewed-by: Daniel Kiper
- grub-core/fs/ext2.c | 10 --
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index e7dd78e..4953a15 100644
a/grub-core/fs/ext2.c
-+++ b/grub-core/fs/ext2.c
-@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
- #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
- #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
-
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e33d4b0286c7ba1ade27f66ff352ce18e1e3273f
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 16 17:39:58 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 16 17:39:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e33d4b02
sys-boot/grub: set QA_CONFIG_IMPL_DECL_SKIP
Closes: https://bugs.gentoo.org/900348
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 5 +
sys-boot/grub/grub-2.12-r1.ebuild | 5 +
sys-boot/grub/grub-.ebuild| 5 +
3 files changed, 15 insertions(+)
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
index 49676a74f04d..31dc1e97ca87 100644
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -310,6 +310,11 @@ src_install() {
# https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
+
+ if use elibc_musl; then
+ # https://bugs.gentoo.org/900348
+ QA_CONFIG_IMPL_DECL_SKIP=( re_set_syntax re_compile_pattern
re_search )
+ fi
}
pkg_postinst() {
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r1.ebuild
index 80ebc54a6379..95e5fdb5c08e 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -314,6 +314,11 @@ src_install() {
# https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
+
+ if use elibc_musl; then
+ # https://bugs.gentoo.org/900348
+ QA_CONFIG_IMPL_DECL_SKIP=( re_set_syntax re_compile_pattern
re_search )
+ fi
}
pkg_postinst() {
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index a8801791925e..4146c10c16ea 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -310,6 +310,11 @@ src_install() {
# https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
+
+ if use elibc_musl; then
+ # https://bugs.gentoo.org/900348
+ QA_CONFIG_IMPL_DECL_SKIP=( re_set_syntax re_compile_pattern
re_search )
+ fi
}
pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: ea9c63b1a6bad848585f082cfba354507f9b620a
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 16 17:35:50 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 16 17:35:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9c63b1
sys-boot/grub: drop 2.06-r8
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 -
sys-boot/grub/grub-2.06-r8.ebuild | 352 --
2 files changed, 353 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b8a7c1d67db5..2e9f525e6c20 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,4 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
DIST grub-2.06-backports-r3.tar.xz 47612 BLAKE2B
235610e826c7a76d05872fb51e74564fb3861590f95377d5dcb9a5a4b0f5037d0b71c9f334bfe0bbe399f65036088d808f7af8e43090007ab7394002d05f7b4a
SHA512
561f031dca2cdc13fc1b3f3cfdbdccd7decd67ef18ddcc588327f141b026eadcda5d64d729929859cad54959b3855ff86c1f62e3ff1d8ae5f6f5ac5761fa6ba4
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
diff --git a/sys-boot/grub/grub-2.06-r8.ebuild
b/sys-boot/grub/grub-2.06-r8.ebuild
deleted file mode 100644
index f7ad850e9909..
--- a/sys-boot/grub/grub-2.06-r8.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2024 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.
-
-if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTOGEN=1
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{8..11} )
-WANT_LIBTOOL=none
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
-
-MY_P=${P}
-if [[ ${PV} != ]]; 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
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r2.tar.xz;
-
-PATCHES=(
- "${WORKDIR}/${P}-backports"
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/grub-2.06-test-words.patch
- "${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
-
"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
-
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 943e555b7daa7e1f7164c3b6af2b869c08881fef
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 16 17:35:29 2024 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 16 17:35:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943e555b
sys-boot/grub: drop 2.12_rc1-r1
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 2 -
sys-boot/grub/grub-2.12_rc1-r1.ebuild | 345 --
2 files changed, 347 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ef0745e6e439..b8a7c1d67db5 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -5,7 +5,5 @@ DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7
DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
DIST grub-2.12.tar.xz 6675608 BLAKE2B
a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431
SHA512
761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
DIST grub-2.12.tar.xz.sig 566 BLAKE2B
9b77fe53041b99f1196743aa6d9fc9c727b17c6512129bab2b35005f2c70f371e30521ddd804bf0c666e36cf2667247980f385ca1ac911fa9b8e0311427dc01c
SHA512
fbe971d8c382578b49d33902234edd9cbd084b70820a1a56a59df4ec30874c0dd4fe27f8dc44bb380716bb7480ca68a87d120a25b92a6a10ff6c8ec1b60548d3
-DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
SHA512
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
-DIST grub-2.12~rc1.tar.xz.sig 566 BLAKE2B
4b0563623498d06f512d29d9a84a4f8386e7d5adf257d0f2ea8f3301e5112b7ad669741d78519dfa35d16e7f1695b0c74740d679f07e41774ecc8910c3f6bc5c
SHA512
b8b3c818679b50810e2d9e597a01c34b05fbc1218a88bdf35aaec798ce29b376c7aa696c50233d416306a480f6ee602dfcbe7eaf481c503f3c203a7b8e8db7a2
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B
81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca
SHA512
0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
diff --git a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
deleted file mode 100644
index 8b47814c2d64..
--- a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
+++ /dev/null
@@ -1,345 +0,0 @@
-# Copyright 1999-2024 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.
-
-if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
-PYTHON_COMPAT=( python3_{9..11} )
-WANT_LIBTOOL=none
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
-
-MY_P=${P}
-if [[ ${PV} != ]]; 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? (
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: a83c857e6470b72be0fea84579a8eb2c6fe5ee47
Author: Sam James gentoo org>
AuthorDate: Tue Dec 26 21:38:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 26 21:38:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83c857e
sys-boot/grub: sync live
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.12-r1.ebuild | 10 ++
sys-boot/grub/grub-.ebuild| 28 +---
2 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r1.ebuild
b/sys-boot/grub/grub-2.12-r1.ebuild
index 80061b9e8e2a..26b25794d046 100644
--- a/sys-boot/grub/grub-2.12-r1.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -33,10 +33,12 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
MY_P=${P}
if [[ ${PV} != ]]; 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/_/'~'}
@@ -52,6 +54,7 @@ if [[ ${PV} != ]]; then
"
S=${WORKDIR}/${P%_*}
fi
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
else
inherit git-r3
@@ -88,7 +91,7 @@ REQUIRED_USE="
grub_platforms_loongson? ( fonts )
"
-BDEPEND="
+BDEPEND+="
${PYTHON_DEPS}
>=sys-devel/flex-2.5.35
sys-devel/bison
@@ -114,7 +117,6 @@ BDEPEND="
virtual/pkgconfig
)
truetype? ( virtual/pkgconfig )
- verify-sig? ( sec-keys/openpgp-keys-danielkiper )
"
DEPEND="
app-arch/xz-utils
@@ -185,7 +187,7 @@ src_prepare() {
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.
+ # 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
}
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 04c3b16c7c59..430fb57a1484 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -23,6 +23,7 @@ fi
PYTHON_COMPAT=( python3_{9..11} )
WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
inherit python-any-r1
@@ -34,17 +35,27 @@ fi
inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+MY_P=${P}
if [[ ${PV} != ]]; 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;
+ 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"
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+ "
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
@@ -80,7 +91,7 @@ REQUIRED_USE="
grub_platforms_loongson? ( fonts )
"
-BDEPEND="
+BDEPEND+="
${PYTHON_DEPS}
>=sys-devel/flex-2.5.35
sys-devel/bison
@@ -111,11 +122,11 @@ DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
grub_platforms_emu? (
- sdl? ( media-libs/libsdl )
+ sdl? ( media-libs/libsdl2 )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs:= )
- mount? ( sys-fs/fuse:0 )
+ 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 )
@@ -149,6 +160,8 @@ src_unpack() {
git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
git-r3_checkout "${GNULIB_URI}" gnulib
popd >/dev/null || die
+
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 287b32c46ef4a274fe2ae132f5de1af413ffc84a
Author: Zac Medico gentoo org>
AuthorDate: Mon Dec 25 20:55:09 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 26 21:24:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=287b32c4
sys-boot/grub: Use libsdl2 instead of libsdl
Solves this configure error with sdl enabled:
checking for SDL2... yes
configure: error: SDL support for grub-emu was explicitly requested but can't
be compiled (disabled by sdl2)
Also fix the fuse dependency to use fuse:3.
Bug: https://bugs.gentoo.org/880377
Bug: https://bugs.gentoo.org/920699
Signed-off-by: Zac Medico gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34475
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/{grub-2.12.ebuild => grub-2.12-r1.ebuild} | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.12.ebuild b/sys-boot/grub/grub-2.12-r1.ebuild
similarity index 98%
rename from sys-boot/grub/grub-2.12.ebuild
rename to sys-boot/grub/grub-2.12-r1.ebuild
index af2c3e716ed0..80061b9e8e2a 100644
--- a/sys-boot/grub/grub-2.12.ebuild
+++ b/sys-boot/grub/grub-2.12-r1.ebuild
@@ -120,11 +120,11 @@ DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
grub_platforms_emu? (
- sdl? ( media-libs/libsdl )
+ sdl? ( media-libs/libsdl2 )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs:= )
- mount? ( sys-fs/fuse:0 )
+ 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 )
@@ -231,7 +231,8 @@ grub_configure() {
$(use_enable themes grub-themes)
$(use_enable truetype grub-mkfont)
$(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
+ --enable-grub-emu-sdl=no
+ $(use_enable sdl grub-emu-sdl2)
${platform:+--with-platform=}${platform}
# Let configure detect this where supported
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 8bc59252563080aa83648bdf16dfba6b21d65213
Author: Ulrich Müller gentoo org>
AuthorDate: Sun Dec 24 11:40:33 2023 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sun Dec 24 11:58:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bc59252
sys-boot/grub: [QA] addpredict doesn't accept multiple paths
Policy reference:
https://devmanual.gentoo.org/function-reference/sandbox-functions/index.html
"None of these functions accept multiple arguments in one call."
Signed-off-by: Ulrich Müller gentoo.org>
sys-boot/grub/grub-2.06-r8.ebuild | 2 +-
sys-boot/grub/grub-2.06-r9.ebuild | 2 +-
sys-boot/grub/grub-2.12.ebuild| 2 +-
sys-boot/grub/grub-2.12_rc1-r1.ebuild | 2 +-
sys-boot/grub/grub-.ebuild| 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r8.ebuild
b/sys-boot/grub/grub-2.06-r8.ebuild
index 8501c806f2a2..98fdb2fbdbc4 100644
--- a/sys-boot/grub/grub-2.06-r8.ebuild
+++ b/sys-boot/grub/grub-2.06-r8.ebuild
@@ -293,7 +293,7 @@ src_configure() {
src_compile() {
# Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
+ use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
grub_do emake
use doc && grub_do_once emake -C docs html
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
index 107cc65e4768..46702ba8aa1f 100644
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -287,7 +287,7 @@ src_configure() {
src_compile() {
# Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
+ use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
grub_do emake
use doc && grub_do_once emake -C docs html
diff --git a/sys-boot/grub/grub-2.12.ebuild b/sys-boot/grub/grub-2.12.ebuild
index cc5868ce0922..af2c3e716ed0 100644
--- a/sys-boot/grub/grub-2.12.ebuild
+++ b/sys-boot/grub/grub-2.12.ebuild
@@ -286,7 +286,7 @@ src_configure() {
src_compile() {
# Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
+ use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
grub_do emake
use doc && grub_do_once emake -C docs html
diff --git a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
index 9e612e8b05a7..dad97c7a4793 100644
--- a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
@@ -284,7 +284,7 @@ src_configure() {
src_compile() {
# Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
+ use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
grub_do emake
use doc && grub_do_once emake -C docs html
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 8d6f9d06e40d..04c3b16c7c59 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -271,7 +271,7 @@ src_configure() {
src_compile() {
# Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
+ use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
grub_do emake
use doc && grub_do_once emake -C docs html
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 76418694270557b6feb75381912a39569ee28d45
Author: Zac Medico gentoo org>
AuthorDate: Thu Dec 21 17:10:06 2023 +
Commit: Zac Medico gentoo org>
CommitDate: Sat Dec 23 00:59:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76418694
sys-boot/grub: add 2.12
* Drop patch for util/grub.d/25_bli.in which was merged upstream.
* Re-add unstable keywords for supported archs.
* Create grub-core/extra_deps.lst missing from source tarball.
Signed-off-by: Zac Medico gentoo.org>
sys-boot/grub/Manifest | 2 +
sys-boot/grub/grub-2.12.ebuild | 347 +
2 files changed, 349 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 84c2839eb3d8..ef0745e6e439 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,6 +3,8 @@ DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc431
DIST grub-2.06-backports-r3.tar.xz 47612 BLAKE2B
235610e826c7a76d05872fb51e74564fb3861590f95377d5dcb9a5a4b0f5037d0b71c9f334bfe0bbe399f65036088d808f7af8e43090007ab7394002d05f7b4a
SHA512
561f031dca2cdc13fc1b3f3cfdbdccd7decd67ef18ddcc588327f141b026eadcda5d64d729929859cad54959b3855ff86c1f62e3ff1d8ae5f6f5ac5761fa6ba4
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
+DIST grub-2.12.tar.xz 6675608 BLAKE2B
a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431
SHA512
761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3
+DIST grub-2.12.tar.xz.sig 566 BLAKE2B
9b77fe53041b99f1196743aa6d9fc9c727b17c6512129bab2b35005f2c70f371e30521ddd804bf0c666e36cf2667247980f385ca1ac911fa9b8e0311427dc01c
SHA512
fbe971d8c382578b49d33902234edd9cbd084b70820a1a56a59df4ec30874c0dd4fe27f8dc44bb380716bb7480ca68a87d120a25b92a6a10ff6c8ec1b60548d3
DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
SHA512
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
DIST grub-2.12~rc1.tar.xz.sig 566 BLAKE2B
4b0563623498d06f512d29d9a84a4f8386e7d5adf257d0f2ea8f3301e5112b7ad669741d78519dfa35d16e7f1695b0c74740d679f07e41774ecc8910c3f6bc5c
SHA512
b8b3c818679b50810e2d9e597a01c34b05fbc1218a88bdf35aaec798ce29b376c7aa696c50233d416306a480f6ee602dfcbe7eaf481c503f3c203a7b8e8db7a2
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.12.ebuild b/sys-boot/grub/grub-2.12.ebuild
new file mode 100644
index ..cc5868ce0922
--- /dev/null
+++ b/sys-boot/grub/grub-2.12.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2023 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.
+
+if [[ ${PV} == ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+PYTHON_COMPAT=( python3_{9..11} )
+WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
+
+MY_P=${P}
+if [[ ${PV} != ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e75b6d56e49cb6cdc29b3b804dd231b8d91a9a08
Author: WANG Xuerui gentoo org>
AuthorDate: Mon Dec 11 16:25:43 2023 +
Commit: WANG Xuerui gentoo org>
CommitDate: Mon Dec 11 16:35:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e75b6d56
sys-boot/grub: keyword 2.12_rc1-r1 for ~loong
This has been working on loong hardware for months already, yet still
not officially tagged. So keyword for ~loong only, to save users from
manual unmasking, and for easy testing of live media production.
Signed-off-by: WANG Xuerui gentoo.org>
sys-boot/grub/grub-2.12_rc1-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
index 6dbe31c4a41e..9e612e8b05a7 100644
--- a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
@@ -53,6 +53,7 @@ if [[ ${PV} != ]]; then
S=${WORKDIR}/${P%_*}
fi
#KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~loong"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e402336a8edeccba279cc6c0b6491ddb9b1cae89
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Oct 5 04:46:42 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Oct 5 04:46:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e402336a
sys-boot/grub: Stabilize 2.06-r9 x86, #915187
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
index 48ff28af00b7..eaede1207205 100644
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -54,7 +54,7 @@ if [[ ${PV} != ]]; then
"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e6dcbcd25a2e4c2df04f6d4023f8675abc82ba06
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Oct 5 04:46:43 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Oct 5 04:46:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6dcbcd2
sys-boot/grub: Stabilize 2.06-r9 amd64, #915187
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
index eaede1207205..f372a2ec6a09 100644
--- a/sys-boot/grub/grub-2.06-r9.ebuild
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -54,7 +54,7 @@ if [[ ${PV} != ]]; then
"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 1dc4028278f21f9a4abaa9ad2bb99e53b4bf46b6
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Oct 4 19:25:25 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Oct 4 19:27:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc40282
sys-boot/grub: security backports
Bug: https://bugs.gentoo.org/915131
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 +
sys-boot/grub/grub-2.06-r9.ebuild | 346 ++
2 files changed, 347 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index e69bf3b0ad42..84c2839eb3d8 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,6 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
+DIST grub-2.06-backports-r3.tar.xz 47612 BLAKE2B
235610e826c7a76d05872fb51e74564fb3861590f95377d5dcb9a5a4b0f5037d0b71c9f334bfe0bbe399f65036088d808f7af8e43090007ab7394002d05f7b4a
SHA512
561f031dca2cdc13fc1b3f3cfdbdccd7decd67ef18ddcc588327f141b026eadcda5d64d729929859cad54959b3855ff86c1f62e3ff1d8ae5f6f5ac5761fa6ba4
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
SHA512
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
diff --git a/sys-boot/grub/grub-2.06-r9.ebuild
b/sys-boot/grub/grub-2.06-r9.ebuild
new file mode 100644
index ..48ff28af00b7
--- /dev/null
+++ b/sys-boot/grub/grub-2.06-r9.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2023 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.
+
+if [[ ${PV} == ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+GRUB_AUTOGEN=1
+GRUB_AUTORECONF=1
+PYTHON_COMPAT=( python3_{8..11} )
+WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dkiper.gpg
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
+
+MY_P=${P}
+if [[ ${PV} != ]]; 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
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
+fi
+
+SRC_URI+="
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/, sys-boot/grub/
commit: 070361537d8ace58dd617b3520c0e2751e1f5574
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Sep 11 01:48:19 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Sep 11 01:48:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07036153
sys-boot/grub: backport fix for arm64
Closes: https://bugs.gentoo.org/913935
Signed-off-by: Mike Gilbert gentoo.org>
...grub-2.06-arm64-linux-Remove-magic-number.patch | 45 ++
.../{grub-2.06-r7.ebuild => grub-2.06-r8.ebuild} | 1 +
2 files changed, 46 insertions(+)
diff --git
a/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
b/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
new file mode 100644
index ..eed3bf0ca93d
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-arm64-linux-Remove-magic-number.patch
@@ -0,0 +1,45 @@
+https://git.savannah.gnu.org/cgit/grub.git/patch/?id=69edb31205602c29293a8c6e67363bba2a4a1e66
+https://bugs.gentoo.org/913935
+
+From 69edb31205602c29293a8c6e67363bba2a4a1e66 Mon Sep 17 00:00:00 2001
+From: Ard Biesheuvel
+Date: Thu, 11 Aug 2022 16:51:57 +0200
+Subject: loader/arm64/linux: Remove magic number header field check
+
+The "ARM\x64" magic number in the file header identifies an image as one
+that implements the bare metal boot protocol, allowing the loader to
+simply move the file to a suitably aligned address in memory, with
+sufficient headroom for the trailing .bss segment (the required memory
+size is described in the header as well).
+
+Note of this matters for GRUB, as it only supports EFI boot. EFI does
+not care about this magic number, and nor should GRUB: this prevents us
+from booting other PE linux images, such as the generic EFI zboot
+decompressor, which is a pure PE/COFF image, and does not implement the
+bare metal boot protocol.
+
+So drop the magic number check.
+
+Signed-off-by: Ard Biesheuvel
+Reviewed-by: Daniel Kiper
+---
+ grub-core/loader/arm64/linux.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
+index ef3e9f9..4c92e48 100644
+--- a/grub-core/loader/arm64/linux.c
b/grub-core/loader/arm64/linux.c
+@@ -51,9 +51,6 @@ static grub_addr_t initrd_end;
+ grub_err_t
+ grub_arch_efi_linux_check_image (struct linux_arch_kernel_header * lh)
+ {
+- if (lh->magic != GRUB_LINUX_ARMXX_MAGIC_SIGNATURE)
+-return grub_error(GRUB_ERR_BAD_OS, "invalid magic number");
+-
+ if ((lh->code0 & 0x) != GRUB_PE32_MAGIC)
+ return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
+ N_("plain image kernel not supported - rebuild with
CONFIG_(U)EFI_STUB enabled"));
+--
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r7.ebuild
b/sys-boot/grub/grub-2.06-r8.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.06-r7.ebuild
rename to sys-boot/grub/grub-2.06-r8.ebuild
index c56c06edbcba..98de90a6d4a3 100644
--- a/sys-boot/grub/grub-2.06-r7.ebuild
+++ b/sys-boot/grub/grub-2.06-r8.ebuild
@@ -72,6 +72,7 @@ PATCHES=(
"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
"${FILESDIR}"/grub-2.06-riscv.patch
"${FILESDIR}"/grub-2.06-locale.patch
+ "${FILESDIR}"/grub-2.06-arm64-linux-Remove-magic-number.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 223832ac2853b44276ec706d9ff81f8950324f08
Author: Oskari Pirhonen gmail com>
AuthorDate: Sat Jul 29 23:19:30 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jul 31 16:40:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223832ac
sys-boot/grub: add verify-sig to 2.12_rc1
Signed-off-by: Oskari Pirhonen gmail.com>
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 +
sys-boot/grub/grub-2.12_rc1-r1.ebuild | 17 ++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6c70d9827749..b8d653465d43 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -2,5 +2,6 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aea
DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
SHA512
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
+DIST grub-2.12~rc1.tar.xz.sig 566 BLAKE2B
4b0563623498d06f512d29d9a84a4f8386e7d5adf257d0f2ea8f3301e5112b7ad669741d78519dfa35d16e7f1695b0c74740d679f07e41774ecc8910c3f6bc5c
SHA512
b8b3c818679b50810e2d9e597a01c34b05fbc1218a88bdf35aaec798ce29b376c7aa696c50233d416306a480f6ee602dfcbe7eaf481c503f3c203a7b8e8db7a2
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B
81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca
SHA512
0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
diff --git a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
index ba4eb3b5a34b..6ca17da64561 100644
--- a/sys-boot/grub/grub-2.12_rc1-r1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
@@ -23,6 +23,7 @@ fi
PYTHON_COMPAT=( python3_{9..11} )
WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dkiper.gpg
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
inherit python-any-r1
@@ -32,16 +33,23 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
+MY_P=${P}
if [[ ${PV} != ]]; 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;
+ 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"
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+ "
S=${WORKDIR}/${P%_*}
fi
#KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
@@ -107,6 +115,7 @@ BDEPEND="
virtual/pkgconfig
)
truetype? ( virtual/pkgconfig )
+ verify-sig? ( sec-keys/openpgp-keys-danielkiper )
"
DEPEND="
app-arch/xz-utils
@@ -150,6 +159,8 @@ src_unpack() {
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
}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 97daf89c0e60fa163c04990d17635cdebd83e579
Author: Oskari Pirhonen gmail com>
AuthorDate: Sat Jul 29 23:25:58 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jul 31 16:40:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97daf89c
sys-boot/grub: add verify-sig to 2.06
Signed-off-by: Oskari Pirhonen gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32099
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 +
sys-boot/grub/grub-2.06-r7.ebuild | 17 ++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b8d653465d43..e69bf3b0ad42 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,7 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
+DIST grub-2.06.tar.xz.sig 566 BLAKE2B
2ff18fb40d9cce36cac110ba9996f88236dbaa261d19e777a6d23a0e9754a9fc8bc45a01896f4838c88bb44edff0172a97611202cb3ffd5653a3cbdfc102ae16
SHA512
797683dafade76b5981bd02f079d7dcecb36f5d07eca652181fd69f3df821931f84cc0d8771bfb80506ef41fbd96edfb202b6698af1fec3c8228dd320a05fa84
DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
SHA512
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
DIST grub-2.12~rc1.tar.xz.sig 566 BLAKE2B
4b0563623498d06f512d29d9a84a4f8386e7d5adf257d0f2ea8f3301e5112b7ad669741d78519dfa35d16e7f1695b0c74740d679f07e41774ecc8910c3f6bc5c
SHA512
b8b3c818679b50810e2d9e597a01c34b05fbc1218a88bdf35aaec798ce29b376c7aa696c50233d416306a480f6ee602dfcbe7eaf481c503f3c203a7b8e8db7a2
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06-r7.ebuild
b/sys-boot/grub/grub-2.06-r7.ebuild
index 3a2f6087bced..c56c06edbcba 100644
--- a/sys-boot/grub/grub-2.06-r7.ebuild
+++ b/sys-boot/grub/grub-2.06-r7.ebuild
@@ -25,6 +25,7 @@ GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
PYTHON_COMPAT=( python3_{8..11} )
WANT_LIBTOOL=none
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/dkiper.gpg
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
inherit python-any-r1
@@ -34,16 +35,23 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
verify-sig
+MY_P=${P}
if [[ ${PV} != ]]; 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;
+ 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"
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+ "
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
@@ -116,6 +124,7 @@ BDEPEND="
virtual/pkgconfig
)
truetype? ( virtual/pkgconfig )
+ verify-sig? ( sec-keys/openpgp-keys-danielkiper )
"
DEPEND="
app-arch/xz-utils
@@ -159,6 +168,8 @@ src_unpack() {
git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
git-r3_checkout "${GNULIB_URI}" gnulib
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: 71cf29063b3a3fb9d7b548d7ed50d62f1e8845a5
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jul 11 14:21:44 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jul 11 14:25:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cf2906
sys-boot/grub: fix grub.d/25_bli on split-usr
Signed-off-by: Mike Gilbert gentoo.org>
...b.d-25_bli.in-fix-shebang-on-unmerged-usr.patch | 31 ++
...rub-2.12_rc1.ebuild => grub-2.12_rc1-r1.ebuild} | 1 +
2 files changed, 32 insertions(+)
diff --git
a/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
new file mode 100644
index ..6c5096d35e70
--- /dev/null
+++
b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
@@ -0,0 +1,31 @@
+From f827aac60d760a026db642b9d5c1ecbf587cfefc Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen
+Date: Mon, 10 Jul 2023 23:55:43 -0500
+Subject: [PATCH] util/grub.d/25_bli.in: fix shebang on unmerged-usr
+
+On an unmerged-usr system, grub-mkconfig errors out with the following
+error due to /usr/bin/sh not existing:
+
+/usr/sbin/grub-mkconfig: /etc/grub.d/25_bli: /usr/bin/sh: bad interpreter: No
such file or directory
+
+Use a /bin/sh shebang to fix the error as well as match the other
+existing files.
+
+Signed-off-by: Oskari Pirhonen
+---
+ util/grub.d/25_bli.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in
+index 6e4538716..26e27a019 100644
+--- a/util/grub.d/25_bli.in
b/util/grub.d/25_bli.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#! /bin/sh
+ set -e
+
+ # grub-mkconfig helper script.
+--
+2.41.0
+
diff --git a/sys-boot/grub/grub-2.12_rc1.ebuild
b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
similarity index 98%
rename from sys-boot/grub/grub-2.12_rc1.ebuild
rename to sys-boot/grub/grub-2.12_rc1-r1.ebuild
index 96f3d98c6f01..ba4eb3b5a34b 100644
--- a/sys-boot/grub/grub-2.12_rc1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}"/gfxpayload.patch
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
"${FILESDIR}"/grub-2.06-test-words.patch
+
"${FILESDIR}"/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 3e5fb448d81388da0f20eef40e0d2a94955941d2
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jul 11 01:07:01 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jul 11 01:07:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5fb448
sys-boot/grub: unkeyword 2.12_rc1
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.12_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12_rc1.ebuild
b/sys-boot/grub/grub-2.12_rc1.ebuild
index 8d6f9d06e40d..96f3d98c6f01 100644
--- a/sys-boot/grub/grub-2.12_rc1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ #KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 24b522484fe0dc6e26dc0ae396503dd0334ba46c
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jul 11 01:05:30 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jul 11 01:05:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b52248
sys-boot/grub: add 2.12_rc1
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest | 2 ++
sys-boot/grub/{grub-.ebuild => grub-2.12_rc1.ebuild} | 10 ++
sys-boot/grub/grub-.ebuild | 10 ++
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 68b8d6346838..6c70d9827749 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,4 +1,6 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
+DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B
edfad62a01970026ca4ad088056da6225ef1319a08e8a95418b24cc8102be7fe45bb1412797aab13f8c1f4f690cf2fa9e5b4725f6769013ce76aa81c43952557
SHA512
6f1fbce004b6dccf58e203bf6a6eeb771bac5ecc54b503265e56a97e9adce0221677bb3e64328144ec921f327a099f0345e7a9952be41cd8808f7635cded52cb
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
+DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B
81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca
SHA512
0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-2.12_rc1.ebuild
similarity index 97%
copy from sys-boot/grub/grub-.ebuild
copy to sys-boot/grub/grub-2.12_rc1.ebuild
index e10ab779e8e6..8d6f9d06e40d 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
@@ -57,7 +57,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
+UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -129,7 +129,7 @@ RDEPEND="${DEPEND}
nls? ( sys-devel/gettext )
"
-RESTRICT="!test? ( test )"
+RESTRICT="!test? ( test ) test? ( userpriv )"
QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
QA_PRESTRIPPED="usr/lib/grub/.*"
@@ -280,7 +280,9 @@ src_compile() {
src_test() {
# The qemu dependency is a bit complex.
# You will need to adjust QEMU_SOFTMMU_TARGETS to match the
cpu/platform.
- grub_do emake check
+ local SANDBOX_WRITE=${SANDBOX_WRITE}
+ addwrite /dev
+ grub_do emake -j1 check
}
src_install() {
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index e10ab779e8e6..8d6f9d06e40d 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
@@ -57,7 +57,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
+UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? (
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 6ea9aa8307b9979eaaa990a0ebc8b5f4e5cbf7be
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jul 10 01:41:32 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jul 10 01:41:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea9aa83
sys-boot/grub: mention grub-mkconfig in upgrade warning
Bug: https://bugs.gentoo.org/910170
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r7.ebuild | 1 +
sys-boot/grub/grub-.ebuild| 1 +
2 files changed, 2 insertions(+)
diff --git a/sys-boot/grub/grub-2.06-r7.ebuild
b/sys-boot/grub/grub-2.06-r7.ebuild
index 15a8221a1c13..3a2f6087bced 100644
--- a/sys-boot/grub/grub-2.06-r7.ebuild
+++ b/sys-boot/grub/grub-2.06-r7.ebuild
@@ -316,6 +316,7 @@ pkg_postinst() {
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
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 359da219ea62..e10ab779e8e6 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -306,6 +306,7 @@ pkg_postinst() {
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
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/, sys-boot/grub/
commit: d69213cd70673f5fb9460ef89215fe04f8b31653
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jul 9 22:41:33 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jul 9 22:41:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69213cd
sys-boot/grub: backport locale fixes
Closes: https://bugs.gentoo.org/910170
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/files/grub-2.06-locale.patch | 68 ++
.../{grub-2.06-r6.ebuild => grub-2.06-r7.ebuild} | 1 +
2 files changed, 69 insertions(+)
diff --git a/sys-boot/grub/files/grub-2.06-locale.patch
b/sys-boot/grub/files/grub-2.06-locale.patch
new file mode 100644
index ..14706cbca3a2
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-locale.patch
@@ -0,0 +1,68 @@
+From 5983c2c6adf1c1bbb3ecd751253d1e898bdfd8a3 Mon Sep 17 00:00:00 2001
+From: Michael Chang
+Date: Tue, 26 Oct 2021 15:11:00 +0800
+Subject: templates: Filter out POSIX locale for translation
+
+The POSIX locale is default or native operating system's locale
+identical to the C locale, so no translation to human speaking languages
+are provided. For this reason we should filter out LANG=POSIX as well as
+LANG=C upon generating grub.cfg to avoid looking up for it's gettext's
+message catalogs that will consequently result in an unpleasant message:
+
+ error: file `/boot/grub/locale/POSIX.gmo' not found
+
+Signed-off-by: Michael Chang
+Reviewed-by: Daniel Kiper
+---
+ util/grub.d/00_header.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 93a9023..f74c2a4 100644
+--- a/util/grub.d/00_header.in
b/util/grub.d/00_header.in
+@@ -191,7 +191,7 @@ EOF
+ EOF
+
+ # Gettext variables and module
+-if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "x" ]; then
++if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" !=
"x" ]; then
+ cat << EOF
+ set locale_dir=\$prefix/locale
+ set lang=${grub_lang}
+--
+cgit v1.1
+
+From f42266a8a2a4215e4ffe419b8092bdf9ced33e8e Mon Sep 17 00:00:00 2001
+From: Christian Hesse
+Date: Mon, 19 Sep 2022 15:31:28 +0200
+Subject: templates: Filter C.UTF-8 locale for translation
+
+In addition to C locale there is also C.UTF-8 locale now. Filter that as
+well, by using ${grub_lang}, which contains a stripped value.
+This fixes the following message and resulting boot failure:
+
+error: file `/boot/grub/locale/C.gmo' not found.
+
+Signed-off-by: Christian Hesse
+Reviewed-by: Daniel Kiper
+---
+ util/grub.d/00_header.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index f74c2a4..6a316a5 100644
+--- a/util/grub.d/00_header.in
b/util/grub.d/00_header.in
+@@ -191,7 +191,7 @@ EOF
+ EOF
+
+ # Gettext variables and module
+-if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" !=
"x" ]; then
++if [ "x${grub_lang}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}"
!= "x" ]; then
+ cat << EOF
+ set locale_dir=\$prefix/locale
+ set lang=${grub_lang}
+--
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r7.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.06-r6.ebuild
rename to sys-boot/grub/grub-2.06-r7.ebuild
index 707acec900be..15a8221a1c13 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r7.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
"${FILESDIR}"/grub-2.06-riscv.patch
+ "${FILESDIR}"/grub-2.06-locale.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
commit: 47dc11ae5fb1b6ca03f8bbe50b1dd6da29182eca Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed May 10 18:18:37 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Thu May 11 20:28:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dc11ae sys-boot/grub: remove unused file Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/30978 Signed-off-by: Conrad Kostecki gentoo.org> sys-boot/grub/files/grub.default-3 | 73 -- 1 file changed, 73 deletions(-) diff --git a/sys-boot/grub/files/grub.default-3 b/sys-boot/grub/files/grub.default-3 deleted file mode 100644 index 3faabf9c6ea9.. --- a/sys-boot/grub/files/grub.default-3 +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# -# To populate all changes in this file you need to regenerate your -# grub configuration file afterwards: -# 'grub-mkconfig -o /boot/grub/grub.cfg' -# -# See the grub info page for documentation on possible variables and -# their associated values. - -GRUB_DISTRIBUTOR="Gentoo" - -# Default menu entry -#GRUB_DEFAULT=0 - -# Boot the default entry this many seconds after the menu is displayed -#GRUB_TIMEOUT=5 -#GRUB_TIMEOUT_STYLE=menu - -# Append parameters to the linux kernel command line -#GRUB_CMDLINE_LINUX="" -# -# Examples: -# -# Boot with network interface renaming disabled -# GRUB_CMDLINE_LINUX="net.ifnames=0" -# -# Boot with systemd instead of sysvinit (openrc) -# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd" - -# Append parameters to the linux kernel command line for non-recovery entries -#GRUB_CMDLINE_LINUX_DEFAULT="" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal. -# Note that you can use only modes which your graphic card supports via VBE. -# You can see them in real GRUB with the command `vbeinfo'. -#GRUB_GFXMODE=640x480 - -# Set to 'text' to force the Linux kernel to boot in normal text -# mode, 'keep' to preserve the graphics mode set using -# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular -# graphics mode, or a sequence of these separated by commas or -# semicolons to try several modes in sequence. -#GRUB_GFXPAYLOAD_LINUX= - -# Path to theme spec txt file. -# The starfield is by default provided with use truetype. -# NOTE: when enabling custom theme, ensure you have required font/etc. -#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" - -# Background image used on graphical terminal. -# Can be in various bitmap formats. -#GRUB_BACKGROUND="/boot/grub/mybackground.png" - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY=true - -# Uncomment to disable generation of the submenu and put all choices on -# the top-level menu. -# Besides the visual affect of no sub menu, this makes navigation of the -# menu easier for a user who can't see the screen. -#GRUB_DISABLE_SUBMENU=y - -# Uncomment to play a tone when the main menu is displayed. -# This is useful, for example, to allow users who can't see the screen -# to know when they can make a choice on the menu. -#GRUB_INIT_TUNE="60 800 1"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: 939f10540fec60b4b22708ebd89610d95ff2097d
Author: Mike Gilbert gentoo org>
AuthorDate: Tue May 9 20:22:13 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue May 9 20:22:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939f1054
sys-boot/grub: backport build fix for RISCV
Closes: https://bugs.gentoo.org/905785
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/files/grub-2.06-riscv.patch | 49 +++
sys-boot/grub/grub-2.06-r6.ebuild | 1 +
2 files changed, 50 insertions(+)
diff --git a/sys-boot/grub/files/grub-2.06-riscv.patch
b/sys-boot/grub/files/grub-2.06-riscv.patch
new file mode 100644
index ..83c54375704b
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-riscv.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/905785
+
+From 049efdd72eb7baa7b2bf8884391ee7fe650da5a0 Mon Sep 17 00:00:00 2001
+From: Heinrich Schuchardt
+Date: Sat, 29 Jan 2022 13:36:55 +0100
+Subject: RISC-V: Adjust -march flags for binutils 2.38
+
+As of version 2.38 binutils defaults to ISA specification version
+2019-12-13. This version of the specification has has separated the
+the csr read/write (csrr*/csrw*) instructions and the fence.i from
+the I extension and put them into separate Zicsr and Zifencei
+extensions.
+
+This implies that we have to adjust the -march flag passed to the
+compiler accordingly.
+
+Signed-off-by: Heinrich Schuchardt
+Reviewed-by: Daniel Kiper
+---
+ configure.ac | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4f649ed..5c01af0 100644
+--- a/configure.ac
b/configure.ac
+@@ -870,11 +870,19 @@ if test x"$platform" != xemu ; then
+CFLAGS="$TARGET_CFLAGS -march=rv32imac -mabi=ilp32 -Werror"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+[grub_cv_target_cc_soft_float="-march=rv32imac
-mabi=ilp32"], [])
++ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
++ CFLAGS="$TARGET_CFLAGS -march=rv32imac_zicsr_zifencei -mabi=ilp32
-Werror"
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++
[grub_cv_target_cc_soft_float="-march=rv32imac_zicsr_zifencei -mabi=ilp32"], [])
+ fi
+ if test "x$target_cpu" = xriscv64; then
+CFLAGS="$TARGET_CFLAGS -march=rv64imac -mabi=lp64 -Werror"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+[grub_cv_target_cc_soft_float="-march=rv64imac
-mabi=lp64"], [])
++ # ISA spec version 20191213 factored out extensions Zicsr and Zifencei
++ CFLAGS="$TARGET_CFLAGS -march=rv64imac_zicsr_zifencei -mabi=lp64
-Werror"
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++
[grub_cv_target_cc_soft_float="-march=rv64imac_zicsr_zifencei -mabi=lp64"], [])
+ fi
+ if test "x$target_cpu" = xia64; then
+CFLAGS="$TARGET_CFLAGS -mno-inline-float-divide -mno-inline-sqrt
-Werror"
+--
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index ee01fcc6bfeb..707acec900be 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
+ "${FILESDIR}"/grub-2.06-riscv.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 2b0cfe49d1b5602616c3d4705ccb0a0b5ce5ad0f
Author: Mike Gilbert gentoo org>
AuthorDate: Tue May 9 20:13:03 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue May 9 20:13:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0cfe49
sys-boot/grub: drop 2.06-r4
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 335 --
1 file changed, 335 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
deleted file mode 100644
index e60b3f92314c..
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2023 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 the autogen.sh.
-# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
-#
-# When applying patches:
-# If gnulib is updated, set GRUB_BOOTSTRAP=1
-# If *.def is updated, set GRUB_AUTOGEN=1
-# If gnulib, *.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.
-
-if [[ ${PV} == ]]; then
- GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{8..11} )
-WANT_LIBTOOL=none
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-
-if [[ ${PV} != ]]; 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;
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r2.tar.xz;
-
-PATCHES=(
- "${WORKDIR}/${P}-backports"
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/grub-2.06-test-words.patch
- "${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
- themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/;
-
-# 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"
-
-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-arch/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/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs:= )
- mount? ( sys-fs/fuse:0 )
- 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}
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !sys-boot/grub:0
- nls? (
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: a2689ef7b2b0fdbd803fc17784008afc7a6fdbd4
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 22 15:14:42 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 22 15:14:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2689ef7
sys-boot/grub: Stabilize 2.06-r6 sparc, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index b5c06f9a5e4c..ee01fcc6bfeb 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: ebef9e1686e0ff2a6f185790505ce3fe3a7038a4
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 22 15:14:31 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 22 15:14:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebef9e16
sys-boot/grub: Stabilize 2.06-r6 arm, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index 9534c466808a..f3ee7bb56b99 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e03f4f3716a5a32fac93bf00cda530b1c06b7586
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 22 15:14:37 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 22 15:14:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e03f4f37
sys-boot/grub: Stabilize 2.06-r6 ppc, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index b8c73c30435a..afc9d1c37739 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 6eefee6ef94a244c8d22797fccd6337ef2e1d353
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 22 15:14:34 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 22 15:14:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eefee6e
sys-boot/grub: Stabilize 2.06-r6 arm64, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index f3ee7bb56b99..b8c73c30435a 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: dd144e36363f14b868b123b18c9dc5788818b192
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 22 15:14:28 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 22 15:14:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd144e36
sys-boot/grub: Stabilize 2.06-r6 x86, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index dac2cf685546..9534c466808a 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 9a593c50b066c987650400b2302d7e4f9aaff64b
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 22 15:14:39 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 22 15:14:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a593c50
sys-boot/grub: Stabilize 2.06-r6 ppc64, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index afc9d1c37739..b5c06f9a5e4c 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: bcb87591142f4c035d35225c5df6cf259b66e6b0
Author: Arthur Zamarin gentoo org>
AuthorDate: Wed Apr 5 03:50:35 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Wed Apr 5 03:50:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcb87591
sys-boot/grub: Stabilize 2.06-r6 amd64, #903704
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
index ce30e75b634b..dac2cf685546 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -46,7 +46,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: 0df5fa7bfab97bfa594d214a78960f44a491bb22
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Feb 13 16:30:22 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Feb 13 16:47:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df5fa7b
sys-boot/grub: backport fix for ext4 checksum seed feature
Closes: https://bugs.gentoo.org/894200
Signed-off-by: Mike Gilbert gentoo.org>
.../grub-2.06-fs-ext2-ignore-checksum-seed.patch | 62 ++
.../{grub-2.06-r5.ebuild => grub-2.06-r6.ebuild} | 1 +
2 files changed, 63 insertions(+)
diff --git a/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
b/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
new file mode 100644
index ..9024b479a878
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-fs-ext2-ignore-checksum-seed.patch
@@ -0,0 +1,62 @@
+https://bugs.gentoo.org/894200
+https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763
+
+From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001
+From: Javier Martinez Canillas
+Date: Fri, 11 Jun 2021 21:36:16 +0200
+Subject: fs/ext2: Ignore checksum seed incompat feature
+
+This incompat feature is used to denote that the filesystem stored its
+metadata checksum seed in the superblock. This is used to allow tune2fs
+changing the UUID on a mounted metdata_csum filesystem without having
+to rewrite all the disk metadata. However, the GRUB doesn't use the
+metadata checksum at all. So, it can just ignore this feature if it
+is enabled. This is consistent with the GRUB filesystem code in general
+which just does a best effort to access the filesystem's data.
+
+The checksum seed incompat feature has to be removed from the ignore
+list if the support for metadata checksum verification is added to the
+GRUB ext2 driver later.
+
+Suggested-by: Eric Sandeen
+Suggested-by: Lukas Czerner
+Signed-off-by: Javier Martinez Canillas
+Reviewed-by: Lukas Czerner
+Reviewed-by: Daniel Kiper
+---
+ grub-core/fs/ext2.c | 10 --
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
+index e7dd78e..4953a15 100644
+--- a/grub-core/fs/ext2.c
b/grub-core/fs/ext2.c
+@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080
+ #define EXT4_FEATURE_INCOMPAT_MMP 0x0100
+ #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200
++#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000
+ #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x1
+
+ /* The set of back-incompatible features this driver DOES support. Add (OR)
+@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+");
+ * mmp:Not really back-incompatible - was added as such to
+ * avoid multiple read-write mounts. Safe to ignore for this
+ * RO driver.
++ * checksum seed: Not really back-incompatible - was added to allow tools
++ * such as tune2fs to change the UUID on a mounted metadata
++ * checksummed filesystem. Safe to ignore for now since the
++ * driver doesn't support checksum verification. However, it
++ * has to be removed from this list if the support is added
later.
+ */
+ #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \
+- | EXT4_FEATURE_INCOMPAT_MMP)
+-
++ | EXT4_FEATURE_INCOMPAT_MMP \
++ | EXT4_FEATURE_INCOMPAT_CSUM_SEED)
+
+ #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U
+
+--
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r5.ebuild
b/sys-boot/grub/grub-2.06-r6.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.06-r5.ebuild
rename to sys-boot/grub/grub-2.06-r6.ebuild
index 06b35f228a26..ce30e75b634b 100644
--- a/sys-boot/grub/grub-2.06-r5.ebuild
+++ b/sys-boot/grub/grub-2.06-r6.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}"/grub-2.06-test-words.patch
"${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
+ "${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: c382388940b194bf1a8bb1c4392394a699108165
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 17 15:53:27 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 17 16:03:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3823889
sys-boot/grub: backport fix for MBR images with clang
Closes: https://bugs.gentoo.org/889432
Signed-off-by: Mike Gilbert gentoo.org>
...py-Remove-.interp-section-from-.img-files.patch | 31 ++
sys-boot/grub/grub-2.06-r5.ebuild | 336 +
2 files changed, 367 insertions(+)
diff --git
a/sys-boot/grub/files/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
b/sys-boot/grub/files/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
new file mode 100644
index ..8d543d4ea9b9
--- /dev/null
+++
b/sys-boot/grub/files/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
@@ -0,0 +1,31 @@
+From 28ad1f9b95799afc94fa178ec935e297da94cced Mon Sep 17 00:00:00 2001
+From: Nicholas Vinson
+Date: Fri, 13 Jan 2023 02:56:35 -0500
+Subject: [PATCH] gentpl.py: Remove .interp section from .img files.
+
+Whn building .img files, a .interp section from the .image files will
+sometimes be copied into the .img file. This additional section pushes
+the .img file beyond the 512-byte limit and causes grub-install to fail
+to run for i386-pc platforms.
+
+Signed-off-by: Nicholas Vinson
+---
+ gentpl.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gentpl.py b/gentpl.py
+index c86550d4f..823a8b5f8 100644
+--- a/gentpl.py
b/gentpl.py
+@@ -766,7 +766,7 @@ def image(defn, platform):
+ if test x$(TARGET_APPLE_LINKER) = x1; then \
+ $(MACHO2IMG) $< $@; \
+ else \
+- $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded
-R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R
.rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx $< $@; \
++ $(TARGET_OBJCOPY) $(""" + cname(defn) + """_OBJCOPYFLAGS) --strip-unneeded
-R .note -R .comment -R .note.gnu.build-id -R .MIPS.abiflags -R .reginfo -R
.rel.dyn -R .note.gnu.gold-version -R .note.gnu.property -R .ARM.exidx -R
.interp $< $@; \
+ fi
+ """)
+
+--
+2.39.0
+
diff --git a/sys-boot/grub/grub-2.06-r5.ebuild
b/sys-boot/grub/grub-2.06-r5.ebuild
new file mode 100644
index ..7267ddc5002b
--- /dev/null
+++ b/sys-boot/grub/grub-2.06-r5.ebuild
@@ -0,0 +1,336 @@
+# Copyright 1999-2023 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.
+
+if [[ ${PV} == ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+GRUB_AUTOGEN=1
+GRUB_AUTORECONF=1
+PYTHON_COMPAT=( python3_{8..11} )
+WANT_LIBTOOL=none
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+
+if [[ ${PV} != ]]; 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;
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r2.tar.xz;
+
+PATCHES=(
+ "${WORKDIR}/${P}-backports"
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/grub-2.06-test-words.patch
+ "${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
+
"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.1.02
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+ themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/;
+
+# Includes licenses for dejavu
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: 1087cf3bbb5bd0ae7fef283497aa19575a5e85e4
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 17 16:01:49 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 17 16:03:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1087cf3b
sys-boot/grub: set GRUB_DISABLE_LINUX_PARTUUID=false by default
Closes: https://bugs.gentoo.org/711072
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/files/grub.default-4 | 76 ++
sys-boot/grub/grub-2.06-r5.ebuild | 2 +-
sys-boot/grub/grub-.ebuild | 2 +-
3 files changed, 78 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/files/grub.default-4
b/sys-boot/grub/files/grub.default-4
new file mode 100644
index ..35d3060137a9
--- /dev/null
+++ b/sys-boot/grub/files/grub.default-4
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+#
+# To populate all changes in this file you need to regenerate your
+# grub configuration file afterwards:
+# 'grub-mkconfig -o /boot/grub/grub.cfg'
+#
+# See the grub info page for documentation on possible variables and
+# their associated values.
+
+GRUB_DISTRIBUTOR="Gentoo"
+
+# Default menu entry
+#GRUB_DEFAULT=0
+
+# Boot the default entry this many seconds after the menu is displayed
+#GRUB_TIMEOUT=5
+#GRUB_TIMEOUT_STYLE=menu
+
+# Append parameters to the linux kernel command line
+#GRUB_CMDLINE_LINUX=""
+#
+# Examples:
+#
+# Boot with network interface renaming disabled
+# GRUB_CMDLINE_LINUX="net.ifnames=0"
+#
+# Boot with systemd instead of sysvinit (openrc)
+# GRUB_CMDLINE_LINUX="init=/usr/lib/systemd/systemd"
+
+# Append parameters to the linux kernel command line for non-recovery entries
+#GRUB_CMDLINE_LINUX_DEFAULT=""
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal.
+# Note that you can use only modes which your graphic card supports via VBE.
+# You can see them in real GRUB with the command `vbeinfo'.
+#GRUB_GFXMODE=640x480
+
+# Set to 'text' to force the Linux kernel to boot in normal text
+# mode, 'keep' to preserve the graphics mode set using
+# 'GRUB_GFXMODE', 'WIDTHxHEIGHT'['xDEPTH'] to set a particular
+# graphics mode, or a sequence of these separated by commas or
+# semicolons to try several modes in sequence.
+#GRUB_GFXPAYLOAD_LINUX=
+
+# Path to theme spec txt file.
+# The starfield is by default provided with use truetype.
+# NOTE: when enabling custom theme, ensure you have required font/etc.
+#GRUB_THEME="/boot/grub/themes/starfield/theme.txt"
+
+# Background image used on graphical terminal.
+# Can be in various bitmap formats.
+#GRUB_BACKGROUND="/boot/grub/mybackground.png"
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Comment if you don't want GRUB to pass "root=PARTUUID=xxx" parameter to
kernel
+GRUB_DISABLE_LINUX_PARTUUID=false
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY=true
+
+# Uncomment to disable generation of the submenu and put all choices on
+# the top-level menu.
+# Besides the visual affect of no sub menu, this makes navigation of the
+# menu easier for a user who can't see the screen.
+#GRUB_DISABLE_SUBMENU=y
+
+# Uncomment to play a tone when the main menu is displayed.
+# This is useful, for example, to allow users who can't see the screen
+# to know when they can make a choice on the menu.
+#GRUB_INIT_TUNE="60 800 1"
diff --git a/sys-boot/grub/grub-2.06-r5.ebuild
b/sys-boot/grub/grub-2.06-r5.ebuild
index 7267ddc5002b..06b35f228a26 100644
--- a/sys-boot/grub/grub-2.06-r5.ebuild
+++ b/sys-boot/grub/grub-2.06-r5.ebuild
@@ -297,7 +297,7 @@ src_install() {
einstalldocs
insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
+ newins "${FILESDIR}"/grub.default-4 grub
# https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index cc531c4c9010..359da219ea62 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -290,7 +290,7 @@ src_install() {
einstalldocs
insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
+ newins "${FILESDIR}"/grub.default-4 grub
# https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: b28240ad2f78ec1ff5395432db4def46be7effb3
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jan 17 15:52:38 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jan 17 16:03:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28240ad
sys-boot/grub: clean up autogen.sh handling
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-.ebuild | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 3f9fdfc128e2..cc531c4c9010 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -5,13 +5,13 @@ 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 the autogen.sh.
+# 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 *.def is updated, set GRUB_AUTOGEN=1
-# If gnulib, *.def, or any autotools files are updated, set GRUB_AUTORECONF=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.
@@ -156,8 +156,6 @@ src_unpack() {
src_prepare() {
default
- sed -i -e /autoreconf/d autogen.sh || die
-
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
python_setup
else
@@ -168,7 +166,7 @@ src_prepare() {
eautopoint --force
AUTOPOINT=: AUTORECONF=: ./bootstrap || die
elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
+ FROM_BOOTSTRAP=1 ./autogen.sh || die
fi
if [[ -n ${GRUB_AUTORECONF} ]]; then
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 56e6e30263e56771de876c0e053561a54fd19ed1
Author: Sam James gentoo org>
AuthorDate: Sun Jan 1 03:04:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 1 03:11:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e6e302
sys-boot/grub: force Bison too
Already in BDEPEND, just unset to avoid having to explicitly say bison vs bison
-y.
Bug: https://bugs.gentoo.org/887211
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 5 +++--
sys-boot/grub/grub-.ebuild| 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 04ab2f692a59..e60b3f92314c 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -262,8 +262,9 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC BUILD_PKG_CONFIG
- # Force configure to use flex, bug 887211.
+ # Force configure to use flex & bison, bug 887211.
export LEX=flex
+ unset YACC
MULTIBUILD_VARIANTS=()
local p
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index a256108539c8..43b43e84e76b 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -258,8 +258,9 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC BUILD_PKG_CONFIG
- # Force configure to use flex, bug 887211.
+ # Force configure to use flex & bison, bug 887211.
export LEX=flex
+ unset YACC
MULTIBUILD_VARIANTS=()
local p
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: dd4f54570ed7c6d99beb16cc2b2b841c30a5a09b
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Dec 20 18:10:40 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Dec 20 18:12:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4f5457
sys-boot/grub: drop 2.06-r3
Bug: https://bugs.gentoo.org/881413
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 -
sys-boot/grub/grub-2.06-r3.ebuild | 331 --
2 files changed, 332 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 591e617ac3ca..68b8d6346838 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,4 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.06-backports-r1.tar.xz 31900 BLAKE2B
d8320eff8cebc408b7c4845d17adf82470407fd3837ab8508703f0f3b2bf5271d6ea8ec2cdf57461e77dd9b69458e9a9d197b533029df3637aad3656b2968b65
SHA512
2487a305ca3f969ed735df0ef181cc7caceffcfaf0126dbd8cceb19ce1062952404f0e5deeaa4f9431cafa94c40c2d57c77da17ea3da4ff62592e42e852b107a
DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06-r3.ebuild
b/sys-boot/grub/grub-2.06-r3.ebuild
deleted file mode 100644
index 3f691ad4626e..
--- a/sys-boot/grub/grub-2.06-r3.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2022 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 the autogen.sh.
-# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
-#
-# When applying patches:
-# If gnulib is updated, set GRUB_BOOTSTRAP=1
-# If *.def is updated, set GRUB_AUTOGEN=1
-# If gnulib, *.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.
-
-if [[ ${PV} == ]]; then
- GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python3_{8..11} )
-WANT_LIBTOOL=none
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-
-if [[ ${PV} != ]]; 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;
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r1.tar.xz;
-
-PATCHES=(
- "${WORKDIR}/${P}-backports"
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/grub-2.06-test-words.patch
- "${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
- themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/;
-
-# 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}"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e93067af16c354c35efd3e674b083c5861456038
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Dec 20 18:06:50 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Dec 20 18:13:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93067af
sys-boot/grub: force LEX=flex
GRUB's configure script checks the version of flex by calling
${LEX} --version. If app-alternatives/lex[reflex] is installed,
this version check will fail.
Closes: https://bugs.gentoo.org/887211
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 5 -
sys-boot/grub/grub-.ebuild| 5 -
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 10638d064406..04ab2f692a59 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -86,7 +86,7 @@ REQUIRED_USE="
BDEPEND="
${PYTHON_DEPS}
- sys-devel/flex
+ >=sys-devel/flex-2.5.35
sys-devel/bison
sys-apps/help2man
sys-apps/texinfo
@@ -262,6 +262,9 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC BUILD_PKG_CONFIG
+ # Force configure to use flex, bug 887211.
+ export LEX=flex
+
MULTIBUILD_VARIANTS=()
local p
for p in "${GRUB_ALL_PLATFORMS[@]}"; do
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 477b43363226..a256108539c8 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -82,7 +82,7 @@ REQUIRED_USE="
BDEPEND="
${PYTHON_DEPS}
- sys-devel/flex
+ >=sys-devel/flex-2.5.35
sys-devel/bison
sys-apps/help2man
sys-apps/texinfo
@@ -258,6 +258,9 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC BUILD_PKG_CONFIG
+ # Force configure to use flex, bug 887211.
+ export LEX=flex
+
MULTIBUILD_VARIANTS=()
local p
for p in "${GRUB_ALL_PLATFORMS[@]}"; do
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 4853463636b2cb46f549355e33c99619cc476f97
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 2 07:31:55 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 2 07:31:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48534636
sys-boot/grub: Stabilize 2.06-r4 x86, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 76f793378133..10638d064406 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: b33374bce7dde218da36d8ce6e1db44cc07aeef2
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:16:01 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:16:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33374bc
sys-boot/grub: Stabilize 2.06-r4 ppc64, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 2ddac6f6fe2e..76f793378133 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: aba3ceb28022df218618a1bed0de62effe0aff79
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:15:49 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:15:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba3ceb2
sys-boot/grub: Stabilize 2.06-r4 amd64, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index c95f6320b398..9f35a9e6824f 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 921246c68a6d98772af3fe54f391edd4884b07f6
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:15:55 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:15:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=921246c6
sys-boot/grub: Stabilize 2.06-r4 arm64, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 38a8e695504b..e65f69b04d0d 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: d80a0b6eeb5db1b6e2b92e7147d22ba97f88a899
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:15:58 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:15:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d80a0b6e
sys-boot/grub: Stabilize 2.06-r4 ppc, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index e65f69b04d0d..2ddac6f6fe2e 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: f91c85d0bdb795174cded9e212a3cfeada029613
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:15:52 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:15:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91c85d0
sys-boot/grub: Stabilize 2.06-r4 arm, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 9f35a9e6824f..38a8e695504b 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
+ KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 2ec995ac3c4e45644308180714f2f5bbb5b278d8
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Nov 19 10:15:43 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Nov 19 10:15:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec995ac
sys-boot/grub: Stabilize 2.06-r4 sparc, #881821
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index af55bd154b52..c95f6320b398 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c123a73d6ad56ef2aae3d07ca51135e16d33d10f
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Nov 16 00:42:37 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Nov 16 00:42:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c123a73d
sys-boot/grub: fix pkgcheck warnings
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r3.ebuild | 5 +++--
sys-boot/grub/grub-2.06-r4.ebuild | 5 +++--
sys-boot/grub/grub-.ebuild| 3 ++-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r3.ebuild
b/sys-boot/grub/grub-2.06-r3.ebuild
index 341b1edc2a5e..3f691ad4626e 100644
--- a/sys-boot/grub/grub-2.06-r3.ebuild
+++ b/sys-boot/grub/grub-2.06-r3.ebuild
@@ -50,7 +50,7 @@ else
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
fi
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r1.tar.xz;
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r1.tar.xz;
PATCHES=(
"${WORKDIR}/${P}-backports"
@@ -73,7 +73,8 @@ LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception )
themes? ( CC-BY-SA-
SLOT="2/${PVR}"
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 )
+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="
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
index 1c1d4ba535b5..af55bd154b52 100644
--- a/sys-boot/grub/grub-2.06-r4.ebuild
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -50,7 +50,7 @@ else
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
fi
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r2.tar.xz;
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports-r2.tar.xz;
PATCHES=(
"${WORKDIR}/${P}-backports"
@@ -73,7 +73,8 @@ LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception )
themes? ( CC-BY-SA-
SLOT="2/${PVR}"
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 )
+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="
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 407e54b6f361..477b43363226 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -69,7 +69,8 @@ LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception )
themes? ( CC-BY-SA-
SLOT="2/${PVR}"
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 )
+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="
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 7f808be26f24a5d938efb272e2d98cd5aa05ecda
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Nov 16 00:29:40 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Nov 16 00:29:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f808be2
sys-boot/grub: backport security fixes
Bug: https://bugs.gentoo.org/881413
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 +
sys-boot/grub/grub-2.06-r4.ebuild | 330 ++
2 files changed, 331 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1629358f341f..591e617ac3ca 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,4 +1,5 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.06-backports-r1.tar.xz 31900 BLAKE2B
d8320eff8cebc408b7c4845d17adf82470407fd3837ab8508703f0f3b2bf5271d6ea8ec2cdf57461e77dd9b69458e9a9d197b533029df3637aad3656b2968b65
SHA512
2487a305ca3f969ed735df0ef181cc7caceffcfaf0126dbd8cceb19ce1062952404f0e5deeaa4f9431cafa94c40c2d57c77da17ea3da4ff62592e42e852b107a
+DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B
d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602
SHA512
99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06-r4.ebuild
b/sys-boot/grub/grub-2.06-r4.ebuild
new file mode 100644
index ..1c1d4ba535b5
--- /dev/null
+++ b/sys-boot/grub/grub-2.06-r4.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2022 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 the autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, *.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.
+
+if [[ ${PV} == ]]; then
+ GRUB_BOOTSTRAP=1
+fi
+
+GRUB_AUTORECONF=1
+PYTHON_COMPAT=( python3_{8..11} )
+WANT_LIBTOOL=none
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+
+if [[ ${PV} != ]]; 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;
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r2.tar.xz;
+
+PATCHES=(
+ "${WORKDIR}/${P}-backports"
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/grub-2.06-test-words.patch
+ "${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.1.02
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+ themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/;
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? (
CC-BY-SA-3.0 BitstreamVera )"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
commit: 7719b94e9a4bf646322889da6eafc121fdfeb1a9 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Sep 28 16:53:38 2022 + Commit: Mike Gilbert gentoo org> CommitDate: Wed Sep 28 19:31:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7719b94e sys-boot/grub: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/27516 Signed-off-by: Mike Gilbert gentoo.org> sys-boot/grub/files/grub-2.06-binutils-2.36.patch | 44 sys-boot/grub/files/grub-2.06-xfs-v4.patch| 120 -- 2 files changed, 164 deletions(-) diff --git a/sys-boot/grub/files/grub-2.06-binutils-2.36.patch b/sys-boot/grub/files/grub-2.06-binutils-2.36.patch deleted file mode 100644 index 5cb327003adb.. --- a/sys-boot/grub/files/grub-2.06-binutils-2.36.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5cea201f288246488e2189c49d969d00ebec2898 Mon Sep 17 00:00:00 2001 -From: Michael Chang -Date: Fri, 19 Feb 2021 17:40:43 +0800 -Subject: [PATCH] Fix build error in binutils 2.36 - -The build fails in binutils 2.36 - -[ 520s] cat kernel_syms.lst > syminfo.lst.new -[ 520s] /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld: section .note.gnu.property VMA [00400158,00400187] overlaps section .bss VMA [f000,0041e1af] - -It is caused by assembler now generates the GNU property notes section -by default. Use the assmbler option -mx86-used-note=no to disable the -section from being generated to workaround the ensuing linker issue. - -Signed-off-by: Michael Chang - configure.ac | 14 ++ - 1 file changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index fa8f74bb9..38ee5f579 100644 a/configure.ac -+++ b/configure.ac -@@ -836,6 +836,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ) && test "x$p - TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow" - fi - -+if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then -+ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works], [grub_cv_cc_mx86_used_note], [ -+CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror" -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], -+ [grub_cv_cc_mx86_used_note=yes], -+ [grub_cv_cc_mx86_used_note=no]) -+ ]) -+ -+ if test "x$grub_cv_cc_mx86_used_note" = xyes; then -+TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no" -+TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no" -+ fi -+fi -+ - # GRUB doesn't use float or doubles at all. Yet some toolchains may decide - # that floats are a good fit to run instead of what's written in the code. - # Given that floating point unit is disabled (if present to begin with) diff --git a/sys-boot/grub/files/grub-2.06-xfs-v4.patch b/sys-boot/grub/files/grub-2.06-xfs-v4.patch deleted file mode 100644 index fe8223780384.. --- a/sys-boot/grub/files/grub-2.06-xfs-v4.patch +++ /dev/null @@ -1,120 +0,0 @@ -From a4b495520e4dc41a896a8b916a64eda9970c50ea Mon Sep 17 00:00:00 2001 -From: Erwan Velu -Date: Wed, 25 Aug 2021 15:31:52 +0200 -Subject: fs/xfs: Fix unreadable filesystem with v4 superblock - -The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) -introduced the bigtime support by adding some features in v3 inodes. -This change extended grub_xfs_inode struct by 76 bytes but also changed -the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this -commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes -XFS_V2_INODE_SIZE becomes 16 bytes too small. - -As a result, the data structures aren't properly aligned and the GRUB -generates "attempt to read or write outside of partition" errors when -trying to read the XFS filesystem: - - GNU GRUB version 2.11 - - grub> set debug=efi,gpt,xfs - grub> insmod part_gpt - grub> ls (hd0,gpt1)/ - partmap/gpt.c:93: Read a valid GPT header - partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880, 3840 - error: attempt to read or write outside of partition. - -This commit change the XFS_V2_INODE_SIZE computation by subtracting 76 -bytes instead of 92 bytes from the actual size of grub_xfs_inode struct. -This 76 bytes value comes from added members: - 20 grub_uint8_t unused5 -1 grub_uint64_t flags2 -48 grub_uint8_t unused6 - -This patch explicitly splits the v2 and v3 parts of the structure. -The unused4 is still ending of the v2 structures and the v3 starts -at unused5. Thanks to this we will avoid
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 3b3b5360aaa4a2dafc84037f492e73ff31814fd7
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Sep 26 14:56:43 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Sep 26 14:58:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3b5360
sys-boot/grub: add postinst warning to run grub-install
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r3.ebuild | 22 --
sys-boot/grub/grub-.ebuild| 22 --
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r3.ebuild
b/sys-boot/grub/grub-2.06-r3.ebuild
index 3331ce3f9b71..341b1edc2a5e 100644
--- a/sys-boot/grub/grub-2.06-r3.ebuild
+++ b/sys-boot/grub/grub-2.06-r3.ebuild
@@ -301,18 +301,28 @@ 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 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 [[ -z ${REPLACING_VERSIONS} ]]; then
+ if [[ -n ${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
+ break
+ fi
+ done
+ else
elog
optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
optfeature "enabling RAID device detection" sys-fs/mdadm
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."
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 5aff4addbbee..407e54b6f361 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -297,18 +297,28 @@ 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 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 [[ -z ${REPLACING_VERSIONS} ]]; then
+ if [[ -n ${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
+ break
+ fi
+ done
+ else
elog
optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
optfeature "enabling RAID device detection" sys-fs/mdadm
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."
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: 012331665f6d5c6f2a48b6619c54f509cd791485
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Sep 16 23:08:57 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Sep 16 23:10:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01233166
sys-boot/grub: backport fix for CVE-2021-3981
Bug: https://bugs.gentoo.org/835082
Signed-off-by: Mike Gilbert gentoo.org>
.../grub-2.06-grub-mkconfig-restore-umask.patch| 41 ++
.../{grub-2.06-r2.ebuild => grub-2.06-r3.ebuild} | 1 +
2 files changed, 42 insertions(+)
diff --git a/sys-boot/grub/files/grub-2.06-grub-mkconfig-restore-umask.patch
b/sys-boot/grub/files/grub-2.06-grub-mkconfig-restore-umask.patch
new file mode 100644
index ..e2a6414ef05b
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-grub-mkconfig-restore-umask.patch
@@ -0,0 +1,41 @@
+From 0adec29674561034771c13e446069b41ef41e4d4 Mon Sep 17 00:00:00 2001
+From: Michael Chang
+Date: Fri, 3 Dec 2021 16:13:28 +0800
+Subject: grub-mkconfig: Restore umask for the grub.cfg
+
+The commit ab2e53c8a (grub-mkconfig: Honor a symlink when generating
+configuration by grub-mkconfig) has inadvertently discarded umask for
+creating grub.cfg in the process of running grub-mkconfig. The resulting
+wrong permission (0644) would allow unprivileged users to read GRUB
+configuration file content. This presents a low confidentiality risk
+as grub.cfg may contain non-secured plain-text passwords.
+
+This patch restores the missing umask and sets the creation file mode
+to 0600 preventing unprivileged access.
+
+Fixes: CVE-2021-3981
+
+Signed-off-by: Michael Chang
+Reviewed-by: Daniel Kiper
+---
+ util/grub-mkconfig.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index c3ea761..62335d0 100644
+--- a/util/grub-mkconfig.in
b/util/grub-mkconfig.in
+@@ -301,7 +301,10 @@ and /etc/grub.d/* files or please file a bug report with
+ exit 1
+ else
+ # none of the children aborted with error, install the new grub.cfg
++oldumask=$(umask)
++umask 077
+ cat ${grub_cfg}.new > ${grub_cfg}
++umask $oldumask
+ rm -f ${grub_cfg}.new
+ fi
+ fi
+--
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r3.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.06-r2.ebuild
rename to sys-boot/grub/grub-2.06-r3.ebuild
index 6373aeeb54b7..3331ce3f9b71 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r3.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}"/gfxpayload.patch
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
"${FILESDIR}"/grub-2.06-test-words.patch
+ "${FILESDIR}"/grub-2.06-grub-mkconfig-restore-umask.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 034c3eb523f406231aefe984560edf432b916f81
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Sep 2 15:39:11 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Sep 2 15:39:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=034c3eb5
sys-boot/grub: drop 2.06-r1
Bug: https://bugs.gentoo.org/850535
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 318 --
1 file changed, 318 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild
b/sys-boot/grub/grub-2.06-r1.ebuild
deleted file mode 100644
index 7e5bd76ac9d0..
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2021 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 the autogen.sh.
-# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
-#
-# When applying patches:
-# If gnulib is updated, set GRUB_BOOTSTRAP=1
-# If *.def is updated, set GRUB_AUTOGEN=1
-# If gnulib, *.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.
-
-if [[ ${PV} == ]]; then
- GRUB_BOOTSTRAP=1
-fi
-
-GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
-WANT_LIBTOOL=none
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
-
-if [[ ${PV} != ]]; 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;
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-else
- inherit git-r3
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
-fi
-
-PATCHES=(
- "${FILESDIR}"/grub-2.06-xfs-v4.patch
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/grub-2.06-test-words.patch
- "${FILESDIR}"/grub-2.06-binutils-2.36.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
- themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/;
-
-# 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"
-
-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
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? (
- media-libs/freetype:2
- virtual/pkgconfig
- )
- test? (
- app-admin/genromfs
- app-arch/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/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs:= )
- mount? ( sys-fs/fuse:0 )
- 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}
- 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 )"
-
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e422941c14ea2ff60b0ee4d97ee49aebd982a767
Author: Matt Turner gentoo org>
AuthorDate: Thu Sep 1 22:16:59 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Sep 1 22:17:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e422941c
sys-boot/grub: Stabilize 2.06-r2 ppc64, #850673
Signed-off-by: Matt Turner gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index 21a1fe037104..6373aeeb54b7 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c460c47bbd2783e74b72def0ac7ff0f6a2efe9c1
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Aug 30 05:06:58 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Aug 30 05:06:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c460c47b
sys-boot/grub: Stabilize 2.06-r2 arm, #867346
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index 3a6c2a723dd5..21a1fe037104 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
+ KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 223051513b4a15bfee55793086ae2978bc7f6337
Author: Sam James gentoo org>
AuthorDate: Wed Jul 20 21:02:30 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 20 21:02:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22305151
sys-boot/grub: Stabilize 2.06-r2 ppc, #850673
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index fce86aecc48f..3a6c2a723dd5 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 4918f07027275f902ca5ad73f8a416fffbeebed1
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jun 25 10:35:08 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jun 25 10:35:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4918f070
sys-boot/grub: Stabilize 2.06-r2 arm64, #850673
Signed-off-by: Arthur Zamarin gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index a93bda4073c4..fce86aecc48f 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c7a3cac70bf4554cb9e6c4f2ee359c7864dade16
Author: matoro users noreply github com>
AuthorDate: Thu Jun 23 04:51:12 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 23 05:19:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a3cac7
sys-boot/grub: Stabilize 2.06-r2 sparc, #850673
Signed-off-by: matoro users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26053
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index 78a600568d12..a93bda4073c4 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 46befbcce4b5fc28fc20fe93ae466e9fbbc95889
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jun 20 18:04:32 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jun 20 18:04:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46befbcc
sys-boot/grub: add python 3.11
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
sys-boot/grub/grub-.ebuild| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index fb8dfa664525..78a600568d12 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == ]]; then
fi
GRUB_AUTORECONF=1
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+PYTHON_COMPAT=( python3_{8..11} )
WANT_LIBTOOL=none
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 8f568dfed408..5aff4addbbee 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,7 @@ if [[ ${PV} == ]]; then
GRUB_BOOTSTRAP=1
fi
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
WANT_LIBTOOL=none
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 830e49d291888e4d9ef8fec431a104f7cf9d1e21
Author: Mike Gilbert gentoo org>
AuthorDate: Mon Jun 20 15:08:49 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Jun 20 15:08:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=830e49d2
sys-boot/grub: backport changes to fix build with clang
Closes: https://bugs.gentoo.org/851831
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 2 +-
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 5fa3c6b4854c..1629358f341f 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,4 +1,4 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.06-backports.tar.xz 30904 BLAKE2B
05d4e113552d4557dd39160047a4364458a0af6d21a67efbc57379c86b34ce590336ac28ae43241cc290d19a59ddf91126a8ef977a6846895e336608f90dcf75
SHA512
6320521d4c21582b52179ba297e6143502e2a5b983d86bd5fbb11903493419aa6c2a2f0358d09649b869ab3c6c65ca50daf0c0a63c51acf858722e880239604b
+DIST grub-2.06-backports-r1.tar.xz 31900 BLAKE2B
d8320eff8cebc408b7c4845d17adf82470407fd3837ab8508703f0f3b2bf5271d6ea8ec2cdf57461e77dd9b69458e9a9d197b533029df3637aad3656b2968b65
SHA512
2487a305ca3f969ed735df0ef181cc7caceffcfaf0126dbd8cceb19ce1062952404f0e5deeaa4f9431cafa94c40c2d57c77da17ea3da4ff62592e42e852b107a
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index fa638e1d3f8c..fb8dfa664525 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -50,7 +50,7 @@ else
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
fi
-SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports.tar.xz;
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/grub-2.06-backports-r1.tar.xz;
PATCHES=(
"${WORKDIR}/${P}-backports"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: bd9c84dc3038769b6a79617cd6b89d9b1c843bcc
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jun 10 07:11:11 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jun 10 07:11:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9c84dc
sys-boot/grub: x86 stable wrt bug #850673
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index 09508618dfa8..fa638e1d3f8c 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 74acc8eb1ed5ddb435d83bf911d36a2a168d8db6
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jun 10 06:48:01 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jun 10 06:48:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74acc8eb
sys-boot/grub: amd64 stable wrt bug #850673
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
index bf83ea7fb219..09508618dfa8 100644
--- a/sys-boot/grub/grub-2.06-r2.ebuild
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 7bbb9e2ce52ffd701c05daa3752f1fe11ec72f27
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Jun 8 01:02:45 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Jun 8 01:02:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bbb9e2c
sys-boot/grub: backport many patches
Bug: https://bugs.gentoo.org/850535
Closes: https://github.com/gentoo/gentoo/pull/25629
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest| 1 +
sys-boot/grub/grub-2.06-r2.ebuild | 319 ++
2 files changed, 320 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 632fe8590e05..5fa3c6b4854c 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,4 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
+DIST grub-2.06-backports.tar.xz 30904 BLAKE2B
05d4e113552d4557dd39160047a4364458a0af6d21a67efbc57379c86b34ce590336ac28ae43241cc290d19a59ddf91126a8ef977a6846895e336608f90dcf75
SHA512
6320521d4c21582b52179ba297e6143502e2a5b983d86bd5fbb11903493419aa6c2a2f0358d09649b869ab3c6c65ca50daf0c0a63c51acf858722e880239604b
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06-r2.ebuild
b/sys-boot/grub/grub-2.06-r2.ebuild
new file mode 100644
index ..bf83ea7fb219
--- /dev/null
+++ b/sys-boot/grub/grub-2.06-r2.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2022 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 the autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, *.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.
+
+if [[ ${PV} == ]]; then
+ GRUB_BOOTSTRAP=1
+fi
+
+GRUB_AUTORECONF=1
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+WANT_LIBTOOL=none
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
+
+if [[ ${PV} != ]]; 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;
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
+fi
+
+SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-backports.tar.xz;
+
+PATCHES=(
+ "${WORKDIR}/${P}-backports"
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/grub-2.06-test-words.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.1.02
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+ themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/;
+
+# 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"
+
+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
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 7c1b967ad02495722e66e18e2e6645388cf384e3
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Dec 15 04:54:32 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Dec 15 04:56:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c1b967a
sys-boot/grub: remove '-pie' from LDFLAGS
Closes: https://bugs.gentoo.org/829165
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 3 +++
sys-boot/grub/grub-.ebuild| 3 +++
2 files changed, 6 insertions(+)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild
b/sys-boot/grub/grub-2.06-r1.ebuild
index 4224c4f643f1..7e5bd76ac9d0 100644
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ b/sys-boot/grub/grub-2.06-r1.ebuild
@@ -242,6 +242,9 @@ 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}
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 7ba93a504196..8f568dfed408 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -240,6 +240,9 @@ 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}
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/, sys-boot/grub/
commit: abe655fe66964de0a45e8d0c158bdf3958cdfd1c
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Sep 23 18:47:53 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Sep 23 18:47:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe655fe
sys-boot/grub: fix xen build with binutils-2.36
Closes: https://bugs.gentoo.org/787221
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/files/grub-2.06-binutils-2.36.patch | 44 +++
sys-boot/grub/grub-2.06-r1.ebuild | 3 +-
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
b/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
new file mode 100644
index 000..5cb327003ad
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-binutils-2.36.patch
@@ -0,0 +1,44 @@
+From 5cea201f288246488e2189c49d969d00ebec2898 Mon Sep 17 00:00:00 2001
+From: Michael Chang
+Date: Fri, 19 Feb 2021 17:40:43 +0800
+Subject: [PATCH] Fix build error in binutils 2.36
+
+The build fails in binutils 2.36
+
+[ 520s] cat kernel_syms.lst > syminfo.lst.new
+[ 520s]
/usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/bin/ld:
section .note.gnu.property VMA [00400158,00400187] overlaps
section .bss VMA [f000,0041e1af]
+
+It is caused by assembler now generates the GNU property notes section
+by default. Use the assmbler option -mx86-used-note=no to disable the
+section from being generated to workaround the ensuing linker issue.
+
+Signed-off-by: Michael Chang
+---
+ configure.ac | 14 ++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index fa8f74bb9..38ee5f579 100644
+--- a/configure.ac
b/configure.ac
+@@ -836,6 +836,20 @@ if ( test "x$target_cpu" = xi386 || test "x$target_cpu" =
xx86_64 ) && test "x$p
+ TARGET_CFLAGS="$TARGET_CFLAGS -mno-mmx -mno-sse -mno-sse2 -mno-sse3
-mno-3dnow"
+ fi
+
++if ( test "x$target_cpu" = xi386 || test "x$target_cpu" = xx86_64 ); then
++ AC_CACHE_CHECK([whether -Wa,-mx86-used-note works],
[grub_cv_cc_mx86_used_note], [
++CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no -Werror"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++ [grub_cv_cc_mx86_used_note=yes],
++ [grub_cv_cc_mx86_used_note=no])
++ ])
++
++ if test "x$grub_cv_cc_mx86_used_note" = xyes; then
++TARGET_CFLAGS="$TARGET_CFLAGS -Wa,-mx86-used-note=no"
++TARGET_CCASFLAGS="$TARGET_CCASFLAGS -Wa,-mx86-used-note=no"
++ fi
++fi
++
+ # GRUB doesn't use float or doubles at all. Yet some toolchains may decide
+ # that floats are a good fit to run instead of what's written in the code.
+ # Given that floating point unit is disabled (if present to begin with)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild
b/sys-boot/grub/grub-2.06-r1.ebuild
index d80b215cc47..4224c4f643f 100644
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ b/sys-boot/grub/grub-2.06-r1.ebuild
@@ -17,10 +17,10 @@ EAPI=7
# corresponding variable in make.conf or the environment.
if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
fi
+GRUB_AUTORECONF=1
PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
WANT_LIBTOOL=none
@@ -55,6 +55,7 @@ PATCHES=(
"${FILESDIR}"/gfxpayload.patch
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
"${FILESDIR}"/grub-2.06-test-words.patch
+ "${FILESDIR}"/grub-2.06-binutils-2.36.patch
)
DEJAVU=dejavu-sans-ttf-2.37
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 2154fad36d773b2fa5a8c11a0ed1977157657557
Author: Marek Szuba gentoo org>
AuthorDate: Thu Sep 16 09:29:54 2021 +
Commit: Marek Szuba gentoo org>
CommitDate: Thu Sep 16 12:32:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2154fad3
sys-boot/grub: keyword 2.06-r1 for ~riscv
Only tested with GRUB_PLATFORMS=efi-64, as this will likely be the main
(if not only) GRUB-supported platform on this arch.
Signed-off-by: Marek Szuba gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild
b/sys-boot/grub/grub-2.06-r1.ebuild
index 932676d67fd..d80b215cc47 100644
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ b/sys-boot/grub/grub-2.06-r1.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 3bd87a8adfebcc22f55823568418f7cb4365a245
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Sep 14 14:00:46 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Sep 14 14:01:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd87a8a
sys-boot/grub: document global variables
Bug: https://bugs.gentoo.org/813037
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 13 +
sys-boot/grub/grub-.ebuild| 13 +
2 files changed, 26 insertions(+)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild
b/sys-boot/grub/grub-2.06-r1.ebuild
index 09e5054052a..932676d67fd 100644
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ b/sys-boot/grub/grub-2.06-r1.ebuild
@@ -3,6 +3,19 @@
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 the autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, *.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.
+
if [[ ${PV} == ]]; then
GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 119378453e6..7ba93a50419 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -3,6 +3,19 @@
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 the autogen.sh.
+# GRUB_AUTORECONF: Inherit autotools and invoke eautoreconf.
+#
+# When applying patches:
+# If gnulib is updated, set GRUB_BOOTSTRAP=1
+# If *.def is updated, set GRUB_AUTOGEN=1
+# If gnulib, *.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.
+
if [[ ${PV} == ]]; then
GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: e8b40aa4bd847dc627ed03a50d50cc80630254a1
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Sep 7 16:13:20 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Sep 7 17:27:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b40aa4
sys-boot/grub: drop 2.06_rc1
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest | 1 -
sys-boot/grub/grub-2.06_rc1.ebuild | 300 -
2 files changed, 301 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f9c1f46a8bb..632fe8590e0 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,4 +1,3 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
-DIST grub-2.06~rc1.tar.xz 6543784 BLAKE2B
2cd322db808e09533aa91db3e03147896f3f8a2fb6bcc932161aace2f1bab9fd1ceb8b56eddf2e531413932c1ef407cdaf5aae49c0b26e7c6c308dbf7916685d
SHA512
093890b0af71b0d346afb415dec106681fd9e3f2f5bda14093c060b861d55ee1b50c8fb24afd072d24968ebebedde290f8220b0374cbd2b2e4508dfb00924122
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild
b/sys-boot/grub/grub-2.06_rc1.ebuild
deleted file mode 100644
index fc1d54cc1cb..000
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- WANT_LIBTOOL=none
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils
toolchain-funcs
-
-if [[ ${PV} != ]]; 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;
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 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
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.1.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
- themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/;
-
-# 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"
-
-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}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? (
- media-libs/freetype:2
- virtual/pkgconfig
- )
- test? (
- app-admin/genromfs
- app-arch/cpio
- app-arch/lzop
- app-emulation/qemu
- dev-libs/libisoburn
- sys-apps/miscfiles
- sys-block/parted
- sys-fs/squashfs-tools
- )
- themes? (
- app-arch/unzip
-
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/, sys-boot/grub/files/
commit: e30b449f5df55dbb7b036639a39afc17972df03a
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Sep 7 17:08:24 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Sep 7 17:27:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30b449f
sys-boot/grub: fix issue with XFS v4 superblocks
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/files/grub-2.06-xfs-v4.patch | 120 +
.../grub/{grub-2.06.ebuild => grub-2.06-r1.ebuild} | 1 +
2 files changed, 121 insertions(+)
diff --git a/sys-boot/grub/files/grub-2.06-xfs-v4.patch
b/sys-boot/grub/files/grub-2.06-xfs-v4.patch
new file mode 100644
index 000..fe822378038
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-xfs-v4.patch
@@ -0,0 +1,120 @@
+From a4b495520e4dc41a896a8b916a64eda9970c50ea Mon Sep 17 00:00:00 2001
+From: Erwan Velu
+Date: Wed, 25 Aug 2021 15:31:52 +0200
+Subject: fs/xfs: Fix unreadable filesystem with v4 superblock
+
+The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support)
+introduced the bigtime support by adding some features in v3 inodes.
+This change extended grub_xfs_inode struct by 76 bytes but also changed
+the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this
+commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes
+XFS_V2_INODE_SIZE becomes 16 bytes too small.
+
+As a result, the data structures aren't properly aligned and the GRUB
+generates "attempt to read or write outside of partition" errors when
+trying to read the XFS filesystem:
+
+ GNU GRUB version 2.11
+
+ grub> set debug=efi,gpt,xfs
+ grub> insmod part_gpt
+ grub> ls (hd0,gpt1)/
+ partmap/gpt.c:93: Read a valid GPT header
+ partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125
+ fs/xfs.c:931: Reading sb
+ fs/xfs.c:270: Validating superblock
+ fs/xfs.c:295: XFS v4 superblock detected
+ fs/xfs.c:962: Reading root ino 128
+ fs/xfs.c:515: Reading inode (128) - 64, 0
+ fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880,
3840
+ error: attempt to read or write outside of partition.
+
+This commit change the XFS_V2_INODE_SIZE computation by subtracting 76
+bytes instead of 92 bytes from the actual size of grub_xfs_inode struct.
+This 76 bytes value comes from added members:
+ 20 grub_uint8_t unused5
+1 grub_uint64_t flags2
+48 grub_uint8_t unused6
+
+This patch explicitly splits the v2 and v3 parts of the structure.
+The unused4 is still ending of the v2 structures and the v3 starts
+at unused5. Thanks to this we will avoid future corruptions of v2
+or v3 inodes.
+
+The XFS_V2_INODE_SIZE is returning to its expected size and the
+filesystem is back to a readable state:
+
+ GNU GRUB version 2.11
+
+ grub> set debug=efi,gpt,xfs
+ grub> insmod part_gpt
+ grub> ls (hd0,gpt1)/
+ partmap/gpt.c:93: Read a valid GPT header
+ partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125
+ fs/xfs.c:931: Reading sb
+ fs/xfs.c:270: Validating superblock
+ fs/xfs.c:295: XFS v4 superblock detected
+ fs/xfs.c:962: Reading root ino 128
+ fs/xfs.c:515: Reading inode (128) - 64, 0
+ fs/xfs.c:515: Reading inode (128) - 64, 0
+ fs/xfs.c:931: Reading sb
+ fs/xfs.c:270: Validating superblock
+ fs/xfs.c:295: XFS v4 superblock detected
+ fs/xfs.c:962: Reading root ino 128
+ fs/xfs.c:515: Reading inode (128) - 64, 0
+ fs/xfs.c:515: Reading inode (128) - 64, 0
+ fs/xfs.c:515: Reading inode (128) - 64, 0
+ fs/xfs.c:515: Reading inode (131) - 64, 768
+ efi/ fs/xfs.c:515: Reading inode (3145856) - 1464904, 0
+ grub2/ fs/xfs.c:515: Reading inode (132) - 64, 1024
+ grub/ fs/xfs.c:515: Reading inode (139) - 64, 2816
+ grub>
+
+Fixes: 8b1e5d193 (fs/xfs: Add bigtime incompat feature support)
+
+Signed-off-by: Erwan Velu
+Tested-by: Carlos Maiolino
+Reviewed-by: Daniel Kiper
+---
+ grub-core/fs/xfs.c | 14 ++
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
+index 0f524c3a8..e3816d1ec 100644
+--- a/grub-core/fs/xfs.c
b/grub-core/fs/xfs.c
+@@ -192,6 +192,11 @@ struct grub_xfs_time_legacy
+ grub_uint32_t nanosec;
+ } GRUB_PACKED;
+
++/*
++ * The struct grub_xfs_inode layout was taken from the
++ * struct xfs_dinode_core which is described here:
++ *
https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf
++ */
+ struct grub_xfs_inode
+ {
+ grub_uint8_t magic[2];
+@@ -208,14 +213,15 @@ struct grub_xfs_inode
+ grub_uint32_t nextents;
+ grub_uint16_t unused3;
+ grub_uint8_t fork_offset;
+- grub_uint8_t unused4[37];
++ grub_uint8_t unused4[17]; /* Last member of inode v2. */
++ grub_uint8_t unused5[20]; /* First member of inode v3.
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 763ee6146cd896ad801a3b937d1d21a92b26c5a2
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Sep 7 17:18:04 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Sep 7 17:27:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763ee614
sys-boot/grub: drop pax-utils
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 3 +--
sys-boot/grub/grub-.ebuild| 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.06-r1.ebuild
b/sys-boot/grub/grub-2.06-r1.ebuild
index 3c49ad5db1f..09e5054052a 100644
--- a/sys-boot/grub/grub-2.06-r1.ebuild
+++ b/sys-boot/grub/grub-2.06-r1.ebuild
@@ -19,7 +19,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils
toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
if [[ ${PV} != ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -69,7 +69,6 @@ REQUIRED_USE="
BDEPEND="
${PYTHON_DEPS}
- app-misc/pax-utils
sys-devel/flex
sys-devel/bison
sys-apps/help2man
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 8046d169817..2c6c543dd39 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -19,7 +19,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils
toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature toolchain-funcs
if [[ ${PV} != ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -68,7 +68,6 @@ REQUIRED_USE="
BDEPEND="
${PYTHON_DEPS}
- app-misc/pax-utils
sys-devel/flex
sys-devel/bison
sys-apps/help2man
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c47fa1eccc311045cb764d891e569fbce1193d1a
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Sep 7 17:27:32 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Sep 7 17:27:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47fa1ec
sys-boot/grub: enable py3.10 and disable py2.7, py3.6, py3.7
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 2c6c543dd39..119378453e6 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == ]]; then
GRUB_BOOTSTRAP=1
fi
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+PYTHON_COMPAT=( python3_{8..10} )
WANT_LIBTOOL=none
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/
commit: 5f689c2332fa0e6f89ffaf85fb17ae745e84d737
Author: Mike Frysinger gentoo org>
AuthorDate: Mon Sep 6 02:57:51 2021 +
Commit: Mike Frysinger gentoo org>
CommitDate: Mon Sep 6 02:59:00 2021 +
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"
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 01061f76804b18970086f6f0a94c3e916fc5895b
Author: Sam James gentoo org>
AuthorDate: Wed Aug 11 19:10:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Aug 11 19:10:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01061f76
sys-boot/grub: Stabilize 2.06 arm64, #799236
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.06.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index 83281d884a3..f5286ca3d6b 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 6d81884e201f7b74c4d1c2e073ce58a1ca4871ed
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 30 10:56:34 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 30 10:56:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d81884e
sys-boot/grub: x86 stable wrt bug #799236
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index 27a5ed34e79..83281d884a3 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 42902d08cab199a5b840567a89ace6cec4f942b8
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 30 10:56:08 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 30 10:56:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42902d08
sys-boot/grub: sparc stable wrt bug #799236
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index 7581a67dda9..27a5ed34e79 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: af5ae2c7f2369a7e436e284e601dba833b47d147
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 30 10:55:44 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 30 10:55:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af5ae2c7
sys-boot/grub: ppc64 stable wrt bug #799236
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index ecc549afcd2..7581a67dda9 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: be17dedfab83391a587c97ba9d45485963550308
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 30 10:55:18 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 30 10:55:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be17dedf
sys-boot/grub: ppc stable wrt bug #799236
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index 7cca54f2289..ecc549afcd2 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c8382af1f5233b40dc0726b832b710a0edf2cc07
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jun 30 10:54:48 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jun 30 10:54:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8382af1
sys-boot/grub: amd64 stable wrt bug #799236
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
index 8046d169817..7cca54f2289 100644
--- a/sys-boot/grub/grub-2.06.ebuild
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 5e82d5f6cdbe4735f4ed355d9798de0154bf5d9a
Author: Mike Gilbert gentoo org>
AuthorDate: Tue Jun 8 19:58:29 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Jun 8 19:58:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e82d5f6
sys-boot/grub: add 2.06
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.06.ebuild | 301 +
2 files changed, 302 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index aeb888abbb9..f9c1f46a8bb 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,4 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
+DIST grub-2.06.tar.xz 6581924 BLAKE2B
2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417
SHA512
4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
DIST grub-2.06~rc1.tar.xz 6543784 BLAKE2B
2cd322db808e09533aa91db3e03147896f3f8a2fb6bcc932161aace2f1bab9fd1ceb8b56eddf2e531413932c1ef407cdaf5aae49c0b26e7c6c308dbf7916685d
SHA512
093890b0af71b0d346afb415dec106681fd9e3f2f5bda14093c060b861d55ee1b50c8fb24afd072d24968ebebedde290f8220b0374cbd2b2e4508dfb00924122
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.06.ebuild b/sys-boot/grub/grub-2.06.ebuild
new file mode 100644
index 000..8046d169817
--- /dev/null
+++ b/sys-boot/grub/grub-2.06.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+WANT_LIBTOOL=none
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils
toolchain-funcs
+
+if [[ ${PV} != ]]; 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;
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.1.02
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+ themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/;
+
+# 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"
+
+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}
+ app-misc/pax-utils
+ sys-devel/flex
+ sys-devel/bison
+ sys-apps/help2man
+ sys-apps/texinfo
+ fonts? (
+ media-libs/freetype:2
+ virtual/pkgconfig
+ )
+ test? (
+ app-admin/genromfs
+ app-arch/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
+
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c7bc3f0d07449fe4f86c9065cf9ffa5f2644a02d
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Apr 22 19:49:04 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Apr 22 19:49:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7bc3f0d
sys-boot/grub: move eclass vars before first inherit
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 4f50f14c6ff..8046d169817 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -8,13 +8,14 @@ if [[ ${PV} == ]]; then
GRUB_BOOTSTRAP=1
fi
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
+WANT_LIBTOOL=none
+
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
inherit python-any-r1
fi
if [[ -n ${GRUB_AUTORECONF} ]]; then
- WANT_LIBTOOL=none
inherit autotools
fi
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/files/, sys-boot/grub/
commit: 6daa5197e9a530c71e1e78d25c1ffb356f78c972
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Apr 21 15:41:38 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Wed Apr 21 15:41:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6daa5197
sys-boot/grub: drop 2.04-r2, 2.05_alpha20200310-r1
Bug: https://bugs.gentoo.org/773991
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/Manifest | 2 -
sys-boot/grub/files/2.04-sparc64-bios-boot.patch | 50
sys-boot/grub/grub-2.04-r2.ebuild| 297 ---
sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild | 288 --
4 files changed, 637 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 34314f59641..aeb888abbb9 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,3 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
SHA512
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
-DIST grub-2.04.tar.xz 6393864 BLAKE2B
413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0
SHA512
9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
-DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B
2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027
SHA512
7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
DIST grub-2.06~rc1.tar.xz 6543784 BLAKE2B
2cd322db808e09533aa91db3e03147896f3f8a2fb6bcc932161aace2f1bab9fd1ceb8b56eddf2e531413932c1ef407cdaf5aae49c0b26e7c6c308dbf7916685d
SHA512
093890b0af71b0d346afb415dec106681fd9e3f2f5bda14093c060b861d55ee1b50c8fb24afd072d24968ebebedde290f8220b0374cbd2b2e4508dfb00924122
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B
97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14
SHA512
b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
b/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
deleted file mode 100644
index 8fd00d497ad..000
--- a/sys-boot/grub/files/2.04-sparc64-bios-boot.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 4e75b2ae313b13b5bfb54cc5e5c53368d6eb2a08 Mon Sep 17 00:00:00 2001
-From: James Clarke
-Date: Thu, 18 Jul 2019 14:31:55 +0200
-Subject: [PATCH] sparc64: Fix BIOS Boot Partition support
-
-Currently, gpt_offset is uninitialised when using a BIOS Boot Partition
-but is used unconditionally inside save_blocklists. Instead, ensure it
-is always initialised to 0 (note that there is already separate code to
-do the equivalent adjustment after we call save_blocklists on this code
-path).
-
-This patch has been tested on a T5-2 LDOM.
-
-Signed-off-by: James Clarke
-Tested-by: John Paul Adrian Glaubitz
-Reviewed-by: Vladimir Serbinenko
-Reviewed-by: Eric Snowberg
-
- util/setup.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
- util/setup.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/util/setup.c b/util/setup.c
-index 6f88f3c..3be88aa 100644
a/util/setup.c
-+++ b/util/setup.c
-@@ -271,6 +271,9 @@ SETUP (const char *dir,
- bl.current_segment =
- GRUB_BOOT_I386_PC_KERNEL_SEG + (GRUB_DISK_SECTOR_SIZE >> 4);
- #endif
-+#ifdef GRUB_SETUP_SPARC64
-+ bl.gpt_offset = 0;
-+#endif
- bl.last_length = 0;
-
- /* Read the boot image by the OS service. */
-@@ -730,7 +733,6 @@ unable_to_embed:
- #ifdef GRUB_SETUP_SPARC64
- {
- grub_partition_t container = root_dev->disk->partition;
--bl.gpt_offset = 0;
-
- if (grub_strstr (container->partmap->name, "gpt"))
- bl.gpt_offset = grub_partition_get_start (container);
---
-cgit v1.0-41-gc330
-
diff --git a/sys-boot/grub/grub-2.04-r2.ebuild
b/sys-boot/grub/grub-2.04-r2.ebuild
deleted file mode 100644
index 04aa2e74e31..000
--- a/sys-boot/grub/grub-2.04-r2.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- WANT_LIBTOOL=none
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild optfeature
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 897eaba917ed0d65a8b499318075097ed6379418
Author: Matt Turner gentoo org>
AuthorDate: Wed Apr 21 03:37:04 2021 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Apr 21 03:38:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=897eaba9
sys-boot/grub: Stabilize 2.06_rc1 sparc, #773991
Signed-off-by: Matt Turner gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild
b/sys-boot/grub/grub-2.06_rc1.ebuild
index 5a89856d0a6..fc1d54cc1cb 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 41f6e6a7d99fee6d9ca6bba51304a6157bcd4cd8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 3 11:02:43 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 4 18:55:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f6e6a7
sys-boot/grub: Drop superfluous optfeature header
Signed-off-by: Andreas Sturmlechner gentoo.org>
sys-boot/grub/grub-2.04-r2.ebuild | 7 +++
sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild | 9 -
sys-boot/grub/grub-2.06_rc1.ebuild | 7 +++
sys-boot/grub/grub-.ebuild | 7 +++
4 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/sys-boot/grub/grub-2.04-r2.ebuild
b/sys-boot/grub/grub-2.04-r2.ebuild
index 04098f7fd8e..04aa2e74e31 100644
--- a/sys-boot/grub/grub-2.04-r2.ebuild
+++ b/sys-boot/grub/grub-2.04-r2.ebuild
@@ -290,9 +290,8 @@ pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog
- elog "You may consider installing the following optional
packages:"
- optfeature "Detect other operating systems (grub-mkconfig)"
sys-boot/os-prober
- optfeature "Create rescue media (grub-mkrescue)"
dev-libs/libisoburn
- optfeature "Enable RAID device detection" sys-fs/mdadm
+ optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
+ optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
+ optfeature "enabling RAID device detection" sys-fs/mdadm
fi
}
diff --git a/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
index c10aa3ca032..a11de124e27 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -281,9 +281,8 @@ pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog
- elog "You may consider installing the following optional
packages:"
- optfeature "Detect other operating systems (grub-mkconfig)"
sys-boot/os-prober
- optfeature "Create rescue media (grub-mkrescue)"
dev-libs/libisoburn
- optfeature "Enable RAID device detection" sys-fs/mdadm
+ optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
+ optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
+ optfeature "enabling RAID device detection" sys-fs/mdadm
fi
}
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild
b/sys-boot/grub/grub-2.06_rc1.ebuild
index 04cef798e60..5a89856d0a6 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -288,10 +288,9 @@ pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog
- elog "You may consider installing the following optional
packages:"
- optfeature "Detect other operating systems (grub-mkconfig)"
sys-boot/os-prober
- optfeature "Create rescue media (grub-mkrescue)"
dev-libs/libisoburn
- optfeature "Enable RAID device detection" sys-fs/mdadm
+ optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
+ optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
+ optfeature "enabling RAID device detection" sys-fs/mdadm
fi
if has_version sys-boot/os-prober; then
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index dc9469d354a..4f50f14c6ff 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -288,10 +288,9 @@ pkg_postinst() {
if [[ -z ${REPLACING_VERSIONS} ]]; then
elog
- elog "You may consider installing the following optional
packages:"
- optfeature "Detect other operating systems (grub-mkconfig)"
sys-boot/os-prober
- optfeature "Create rescue media (grub-mkrescue)"
dev-libs/libisoburn
- optfeature "Enable RAID device detection" sys-fs/mdadm
+ optfeature "detecting other operating systems (grub-mkconfig)"
sys-boot/os-prober
+ optfeature "creating rescue media (grub-mkrescue)"
dev-libs/libisoburn
+ optfeature "enabling RAID device detection" sys-fs/mdadm
fi
if has_version sys-boot/os-prober; then
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: c95ee8bd6ca802b5616ffa79f1d336120f4ff92d
Author: Sam James gentoo org>
AuthorDate: Sun Mar 28 07:10:05 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 28 07:10:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95ee8bd
sys-boot/grub: Stabilize 2.06_rc1 arm64, #773991
Signed-off-by: Sam James gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild
b/sys-boot/grub/grub-2.06_rc1.ebuild
index 5f9498ea350..04cef798e60 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: d9fe5889872531dc47824cbe1040f645f103ece0
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Mar 27 18:24:48 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Mar 27 18:24:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fe5889
sys-boot/grub: ppc64 stable wrt bug #773991
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild
b/sys-boot/grub/grub-2.06_rc1.ebuild
index 2df8d2f447c..5f9498ea350 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~sparc x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git;
[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
commit: 35cba5363289e65fca43c8f34e4d0ef41721200a
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Mar 26 17:51:22 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Mar 26 17:51:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cba536
sys-boot/grub: export BUILD_PKG_CONFIG
Signed-off-by: Mike Gilbert gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 +-
sys-boot/grub/grub-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild
b/sys-boot/grub/grub-2.06_rc1.ebuild
index 88a1c7ee41f..2df8d2f447c 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -239,7 +239,7 @@ src_configure() {
unset LDFLAGS
tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
+ tc-export BUILD_CC BUILD_PKG_CONFIG
MULTIBUILD_VARIANTS=()
local p
diff --git a/sys-boot/grub/grub-.ebuild b/sys-boot/grub/grub-.ebuild
index 2e85d9e0329..dc9469d354a 100644
--- a/sys-boot/grub/grub-.ebuild
+++ b/sys-boot/grub/grub-.ebuild
@@ -239,7 +239,7 @@ src_configure() {
unset LDFLAGS
tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
+ tc-export BUILD_CC BUILD_PKG_CONFIG
MULTIBUILD_VARIANTS=()
local p
