[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

Mike Gilbert Mon, 10 Jul 2023 18:07:30 -0700

commit:     24b522484fe0dc6e26dc0ae396503dd0334ba46c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 01:05:30 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 01:05:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24b52248


sys-boot/grub: add 2.12_rc1

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/grub/Manifest                                   |  2 ++
 sys-boot/grub/{grub-9999.ebuild => grub-2.12_rc1.ebuild} | 10 ++++++----
 sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-2.12_rc1.ebuild
similarity index 97%
copy from sys-boot/grub/grub-9999.ebuild
copy to sys-boot/grub/grub-2.12_rc1.ebuild
index e10ab779e8e6..8d6f9d06e40d 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index e10ab779e8e6..8d6f9d06e40d 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -44,7 +44,7 @@ if [[ ${PV} != 9999 ]]; 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() {

[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

Reply via email to