* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-06-30 10:56 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-06-30 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 42902d08cab199a5b840567a89ace6cec4f942b8
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 10:56:08 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 10:56:08 2021 +0000
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 <ago <AT> 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} != 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 sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-21 13:11 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-09-21 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 847add601a595beb423c20462e66e397dec41594
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 13:11:23 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 13:11:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847add60
sys-boot/grub: Stabilize 2.12-r5 ppc64, #939542
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index 3c857ee0b249..a6f2a8896ff7 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -52,7 +52,7 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-21 13:11 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-09-21 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 4e8bb601a7935dcc6191b0c9cad4e4a9ac94bab7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 13:11:26 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 13:11:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8bb601
sys-boot/grub: Stabilize 2.12-r5 ppc, #939542
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index a6f2a8896ff7..2328a488d4ec 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -52,7 +52,7 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-13 19:33 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-09-13 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 7ee5ea399d76cb4da39b050b560b3025bdc7086e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 19:33:41 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 19:33:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ee5ea39
sys-boot/grub: Stabilize 2.12-r5 arm64, #939542
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index d69882140160..3c857ee0b249 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -52,7 +52,7 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-12 19:34 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2024-09-12 19:34 UTC (permalink / raw
To: gentoo-commits
commit: bf5dc4d841982a78cdd247bcf7834e5b03fbf08c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 19:34:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 19:34:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5dc4d8
sys-boot/grub: Stabilize 2.12-r5 x86, #939542
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index e9a360b6e012..d69882140160 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -52,7 +52,7 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-12 19:34 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2024-09-12 19:34 UTC (permalink / raw
To: gentoo-commits
commit: d1a4f3eb1c3afcf2a133ed9cbb2694fde6f8fdaf
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 19:34:09 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 19:34:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a4f3eb
sys-boot/grub: Stabilize 2.12-r5 amd64, #939542
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index 7691d3810f6a..e9a360b6e012 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -52,7 +52,7 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-danielkiper )"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-12 18:26 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-09-12 18:26 UTC (permalink / raw
To: gentoo-commits
commit: b4efe21a38947ac8eef56424b79ae2e36c134325
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 18:26:09 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 18:26:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4efe21a
sys-boot/grub: enable device-mapper by default
Closes: https://bugs.gentoo.org/939361
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.12-r5.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index b79c99dc9484..4669eb069663 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -74,7 +74,7 @@ SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
# 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"
+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 )
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 31db1cdb8e2c..502541d5de17 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -75,7 +75,7 @@ SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
# 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"
+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 )
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-11 14:54 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-09-11 14:54 UTC (permalink / raw
To: gentoo-commits
commit: 986a98ecc0e29535d3a6c55fedf599aea56841f4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 11 14:50:51 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Sep 11 14:50:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986a98ec
sys-boot/grub: update device-mapper USE description
Bug: https://bugs.gentoo.org/939361
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index a5ad32e2e733..c8fd5827d3e5 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -11,7 +11,7 @@
</maintainer>
<use>
<flag name="device-mapper">
- Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg>
+ Enable support for devmapper. Required for LUKS or LVM volume detection.
</flag>
<flag name="efiemu">
Build and install the efiemu runtimes
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-09-05 15:34 James Le Cuirot
0 siblings, 0 replies; 215+ messages in thread
From: James Le Cuirot @ 2024-09-05 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 4a8df410b50a41e27f300146cccb29e8a9011a21
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 15:33:58 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 15:33:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8df410
sys-boot/grub: Move PATCHES back outside src_prepare
Having them inside makes monkey patching harder.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
sys-boot/grub/grub-2.12-r4.ebuild | 16 ++++++++--------
sys-boot/grub/grub-2.12-r5.ebuild | 16 ++++++++--------
sys-boot/grub/grub-9999.ebuild | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/sys-boot/grub/grub-2.12-r4.ebuild b/sys-boot/grub/grub-2.12-r4.ebuild
index 5ce4953d88c4..be8779e57cb7 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -57,6 +57,14 @@ 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
+ "${FILESDIR}"/grub-2.12-fwsetup.patch
+ "${WORKDIR}"/grub-2.12-bash-completion.patch
+)
+
DEJAVU=dejavu-sans-ttf-2.37
UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -154,14 +162,6 @@ src_unpack() {
}
src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/grub-2.06-test-words.patch
- "${FILESDIR}"/grub-2.12-fwsetup.patch
- "${WORKDIR}"/grub-2.12-bash-completion.patch
- )
-
default
python_setup
diff --git a/sys-boot/grub/grub-2.12-r5.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
index 1e22477b727a..b79c99dc9484 100644
--- a/sys-boot/grub/grub-2.12-r5.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.ebuild
@@ -58,6 +58,14 @@ 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
+ "${FILESDIR}"/grub-2.12-fwsetup.patch
+ "${WORKDIR}"/grub-2.12-bash-completion.patch
+)
+
DEJAVU=dejavu-sans-ttf-2.37
UNIFONT=unifont-15.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -155,14 +163,6 @@ src_unpack() {
}
src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/grub-2.06-test-words.patch
- "${FILESDIR}"/grub-2.12-fwsetup.patch
- "${WORKDIR}"/grub-2.12-bash-completion.patch
- )
-
default
python_setup
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2b24a0433912..31db1cdb8e2c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -61,6 +61,12 @@ 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 )
@@ -158,12 +164,6 @@ 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
python_setup
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-08-07 19:21 Andrew Ammerlaan
0 siblings, 0 replies; 215+ messages in thread
From: Andrew Ammerlaan @ 2024-08-07 19:21 UTC (permalink / raw
To: gentoo-commits
commit: 940eefc07945dbf5d50dc818c3557e90a0d860f4
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 7 14:31:33 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Aug 7 19:21:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=940eefc0
sys-boot/grub: implement USE=secureboot via grub-mkstandalone
This makes it possible to create a pre-built grub EFI executable signed for
secureboot via portage/`secureboot.eclass`.
It greatly simplifies setting up grub with secureboot, which is now a bit of a
tricky section in the handbook, and makes it possible to get a signed grub EFI
executable on systems that do not have the `SECUREBOOT_SIGN_KEY` available via
a `sys-boot/grub[secureboot]` binpkg.
Unfortunately, since the use of boot partitions, and the mounting point of
ESP's varies between systems we cannot rely on the default
`/boot/grub/grub.cfg` location to configure grub. Instead the standalone
executable reads the `grub.cfg` in the same directory it is in.
It is then up to the user to either:
- configure `sys-kernel/installkernel` to put the `grub.cfg` in a different
location via `GRUB_CFG=`, or
- add a little `grub.cfg` that chainloads the real `grub.cfg`.
To make this even easier we could write some wrapper around grub-install which
would optionally install the prebuilt standalone EFI executable plus an
appropriate little `grub.cfg` to chainload the usual `grub.cfg`. But lets
leave that for later.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/38007
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
.../grub/{grub-9999.ebuild => grub-2.12-r5.ebuild} | 99 ++++++++++++++++++++--
sys-boot/grub/grub-9999.ebuild | 86 ++++++++++++++++++-
2 files changed, 178 insertions(+), 7 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-2.12-r5.ebuild
similarity index 73%
copy from sys-boot/grub/grub-9999.ebuild
copy to sys-boot/grub/grub-2.12-r5.ebuild
index f007f3aaa884..1e22477b727a 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-2.12-r5.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} == 9999 ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
+GRUB_AUTORECONF=1
PYTHON_COMPAT=( python3_{10..12} )
WANT_LIBTOOL=none
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dkiper.gpg
@@ -29,7 +25,8 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1
+inherit secureboot toolchain-funcs
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
@@ -49,6 +46,7 @@ if [[ ${PV} != 9999 ]]; then
else
SRC_URI="
mirror://gnu/${PN}/${P}.tar.xz
+ https://dev.gentoo.org/~floppym/dist/${P}-bash-completion.patch.gz
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
"
S=${WORKDIR}/${P%_*}
@@ -161,6 +159,8 @@ 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
)
default
@@ -177,6 +177,10 @@ src_prepare() {
if [[ -n ${GRUB_AUTORECONF} ]]; then
eautoreconf
fi
+
+ # Avoid error due to extra_deps.lst missing from source tarball:
+ # make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop.
+ echo "depends bli part_gpt" > grub-core/extra_deps.lst || die
}
grub_do() {
@@ -291,6 +295,70 @@ src_test() {
grub_do emake -j1 check
}
+grub_mkstandalone_secureboot() {
+ use secureboot || return
+
+ if tc-is-cross-compiler; then
+ ewarn "USE=secureboot is not supported when cross-compiling."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local standalone_targets
+
+ case ${CTARGET:-${CHOST}} in
+ i?86* | x86_64*)
+ use grub_platforms_efi-32 && standalone_targets+=( i386-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( x86_64-efi )
+ ;;
+ arm* | aarch64*)
+ use grub_platforms_efi-32 && standalone_targets+=( arm-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( arm64-efi )
+ ;;
+ riscv*)
+ use grub_platforms_efi-32 && standalone_targets+=( riscv32-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( riscv64-efi )
+ ;;
+ ia64*)
+ use grub_platforms_efi-64 && standalone_targets+=( ia64-efi )
+ ;;
+ loongarch64*)
+ use grub_platforms_efi-64 && standalone_targets+=( loongarch64-efi )
+ ;;
+ esac
+
+ if [[ ${#standalone_targets[@]} -eq 0 ]]; then
+ ewarn "USE=secureboot is enabled, but no suitable EFI target in GRUB_PLATFORMS."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local target mkstandalone_args
+
+ # grub-mkstandalone embeds a config file, make this config file chainload
+ # a config file in the same directory grub is installed in. This requires
+ # pre-loading the part_gpt and part_msdos modules.
+ echo 'configfile ${cmdpath}/grub.cfg' > "${T}/grub.cfg" || die
+ for target in "${standalone_targets[@]}"; do
+ ebegin "Building standalone EFI executable for ${target}"
+ mkstandalone_args=(
+ --verbose
+ --directory="${ED}/usr/lib/grub/${target}"
+ --locale-directory="${ED}/usr/share/locale"
+ --format="${target}"
+ --modules="part_gpt part_msdos"
+ --sbat="${ED}/usr/share/grub/sbat.csv"
+ --output="${ED}/usr/lib/grub/grub-${target%-efi}.efi"
+ "boot/grub/grub.cfg=${T}/grub.cfg"
+ )
+
+ "${ED}/usr/bin/grub-mkstandalone" "${mkstandalone_args[@]}"
+ eend ${?} || die "grub-mkstandalone failed to build EFI executable"
+ done
+
+ secureboot_auto_sign
+}
+
src_install() {
grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
@@ -311,6 +379,8 @@ src_install() {
# https://bugs.gentoo.org/900348
QA_CONFIG_IMPL_DECL_SKIP=( re_{compile_pattern,match,search,set_syntax} )
fi
+
+ grub_mkstandalone_secureboot
}
pkg_postinst() {
@@ -345,4 +415,21 @@ pkg_postinst() {
ewarn "Due to security concerns, os-prober is disabled by default."
ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
fi
+
+ if use secureboot; then
+ elog
+ elog "The signed standalone grub EFI executable(s) are available in:"
+ elog " /usr/lib/grub/grub-<target>.efi(.signed)"
+ elog "These EFI executables should be copied to the usual location at:"
+ elog " ESP/EFI/Gentoo/grub<arch>.efi"
+ elog "Note that 'grub-install' does not install these images."
+ elog
+ elog "These standalone grub executables read the grub config file from"
+ elog "the grub.cfg in the same directory instead of the default"
+ elog "/boot/grub/grub.cfg. When sys-kernel/installkernel[grub] is used,"
+ elog "the location of the grub.cfg may be overridden by setting the"
+ elog "GRUB_CFG environment variable:"
+ elog " GRUB_CFG=ESP/EFI/Gentoo/grub.cfg"
+ elog
+ fi
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index f007f3aaa884..2b24a0433912 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -29,7 +29,8 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1 toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature python-any-r1
+inherit secureboot toolchain-funcs
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
@@ -291,6 +292,70 @@ src_test() {
grub_do emake -j1 check
}
+grub_mkstandalone_secureboot() {
+ use secureboot || return
+
+ if tc-is-cross-compiler; then
+ ewarn "USE=secureboot is not supported when cross-compiling."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local standalone_targets
+
+ case ${CTARGET:-${CHOST}} in
+ i?86* | x86_64*)
+ use grub_platforms_efi-32 && standalone_targets+=( i386-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( x86_64-efi )
+ ;;
+ arm* | aarch64*)
+ use grub_platforms_efi-32 && standalone_targets+=( arm-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( arm64-efi )
+ ;;
+ riscv*)
+ use grub_platforms_efi-32 && standalone_targets+=( riscv32-efi )
+ use grub_platforms_efi-64 && standalone_targets+=( riscv64-efi )
+ ;;
+ ia64*)
+ use grub_platforms_efi-64 && standalone_targets+=( ia64-efi )
+ ;;
+ loongarch64*)
+ use grub_platforms_efi-64 && standalone_targets+=( loongarch64-efi )
+ ;;
+ esac
+
+ if [[ ${#standalone_targets[@]} -eq 0 ]]; then
+ ewarn "USE=secureboot is enabled, but no suitable EFI target in GRUB_PLATFORMS."
+ ewarn "No standalone EFI executable will be built."
+ return 1
+ fi
+
+ local target mkstandalone_args
+
+ # grub-mkstandalone embeds a config file, make this config file chainload
+ # a config file in the same directory grub is installed in. This requires
+ # pre-loading the part_gpt and part_msdos modules.
+ echo 'configfile ${cmdpath}/grub.cfg' > "${T}/grub.cfg" || die
+ for target in "${standalone_targets[@]}"; do
+ ebegin "Building standalone EFI executable for ${target}"
+ mkstandalone_args=(
+ --verbose
+ --directory="${ED}/usr/lib/grub/${target}"
+ --locale-directory="${ED}/usr/share/locale"
+ --format="${target}"
+ --modules="part_gpt part_msdos"
+ --sbat="${ED}/usr/share/grub/sbat.csv"
+ --output="${ED}/usr/lib/grub/grub-${target%-efi}.efi"
+ "boot/grub/grub.cfg=${T}/grub.cfg"
+ )
+
+ "${ED}/usr/bin/grub-mkstandalone" "${mkstandalone_args[@]}"
+ eend ${?} || die "grub-mkstandalone failed to build EFI executable"
+ done
+
+ secureboot_auto_sign
+}
+
src_install() {
grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
@@ -311,6 +376,8 @@ src_install() {
# https://bugs.gentoo.org/900348
QA_CONFIG_IMPL_DECL_SKIP=( re_{compile_pattern,match,search,set_syntax} )
fi
+
+ grub_mkstandalone_secureboot
}
pkg_postinst() {
@@ -345,4 +412,21 @@ pkg_postinst() {
ewarn "Due to security concerns, os-prober is disabled by default."
ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
fi
+
+ if use secureboot; then
+ elog
+ elog "The signed standalone grub EFI executable(s) are available in:"
+ elog " /usr/lib/grub/grub-<target>.efi(.signed)"
+ elog "These EFI executables should be copied to the usual location at:"
+ elog " ESP/EFI/Gentoo/grub<arch>.efi"
+ elog "Note that 'grub-install' does not install these images."
+ elog
+ elog "These standalone grub executables read the grub config file from"
+ elog "the grub.cfg in the same directory instead of the default"
+ elog "/boot/grub/grub.cfg. When sys-kernel/installkernel[grub] is used,"
+ elog "the location of the grub.cfg may be overridden by setting the"
+ elog "GRUB_CFG environment variable:"
+ elog " GRUB_CFG=ESP/EFI/Gentoo/grub.cfg"
+ elog
+ fi
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-08-04 15:28 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-08-04 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 051ee15e6afa5f5e911874ba3c4e1d3d41d66160
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 4 15:27:50 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug 4 15:27:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051ee15e
sys-boot/grub: mention sys-fs/mtools in optfeature
Closes: https://bugs.gentoo.org/803398
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.12-r4.ebuild | 2 +-
sys-boot/grub/grub-9999.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 66b37086f92f..5ce4953d88c4 100644
--- a/sys-boot/grub/grub-2.12-r4.ebuild
+++ b/sys-boot/grub/grub-2.12-r4.ebuild
@@ -334,7 +334,7 @@ pkg_postinst() {
else
elog
optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
- optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
+ optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]"
fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1061d6ebe58d..f007f3aaa884 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -331,7 +331,7 @@ pkg_postinst() {
else
elog
optfeature "detecting other operating systems (grub-mkconfig)" sys-boot/os-prober
- optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn
+ optfeature "creating rescue media (grub-mkrescue)" dev-libs/libisoburn sys-fs/mtools
optfeature "enabling RAID device detection" sys-fs/mdadm
optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]"
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-04-30 18:46 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-04-30 18:46 UTC (permalink / raw
To: gentoo-commits
commit: fe420281b87aaf017e0bf6d201184c1fa977b9a6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 30 18:44:58 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Apr 30 18:46:01 2024 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.12-r4.ebuild | 12 ++----------
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 3e36233d4ef0..1061d6ebe58d 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-04-13 14:52 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-04-13 14:52 UTC (permalink / raw
To: gentoo-commits
commit: 3857c12049e8ef49544d910fa355acd70733043e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 14:51:32 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 14:51:32 2024 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.12-r4.ebuild | 2 +-
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index cbeeb45ebfb4..688a7f51bb8a 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]]; 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-04-04 20:35 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-04-04 20:35 UTC (permalink / raw
To: gentoo-commits
commit: df4705e9a2a76f5d77e7eb0f43f807b0fc3a946c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 20:34:52 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 20:34:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df4705e9
sys-boot/grub: fix pkgcheck warnings
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.12-r3.ebuild | 8 ++++----
sys-boot/grub/grub-9999.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} != 9999 ]]; then
inherit verify-sig
@@ -46,7 +49,7 @@ if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index bfd0dd40817c..cbeeb45ebfb4 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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} != 9999 ]]; 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}"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-04-04 20:35 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-04-04 20:35 UTC (permalink / raw
To: gentoo-commits
commit: fc242244bc7ce0e280091846adb5a8f3ebbafdd7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 20:35:16 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 20:35:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc242244
sys-boot/grub: drop 2.06-r9
Signed-off-by: Mike Gilbert <floppym <AT> 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="
- https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz
- verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )
- "
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="
- mirror://gnu/${PN}/${P}.tar.xz
- verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
- "
- S=${WORKDIR}/${P%_*}
- fi
- 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-r3.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 )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-BDEPEND="
- ${PYTHON_DEPS}
- >=sys-devel/flex-2.5.35
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? (
- media-libs/freetype:2
- virtual/pkgconfig
- )
- test? (
- app-admin/genromfs
- app-alternatives/cpio
- app-arch/lzop
- app-emulation/qemu
- dev-libs/libisoburn
- sys-apps/miscfiles
- sys-block/parted
- sys-fs/squashfs-tools
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- virtual/pkgconfig
- )
- truetype? ( virtual/pkgconfig )
- verify-sig? ( sec-keys/openpgp-keys-danielkiper )
-"
-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 )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- elif use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
- fi
- default
-}
-
-src_prepare() {
- default
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- FROM_BOOTSTRAP=1 ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # Workaround for bug 829165.
- filter-ldflags -pie
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- # Force configure to use flex & bison, bug 887211.
- export LEX=flex
- unset YACC
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-4 grub
-
- # 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_{compile_pattern,match,search,set_syntax} )
- fi
-}
-
-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 [[ -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 "Re-run grub-mkconfig to update grub.cfg!"
- 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
- optfeature "automatically updating GRUB's configuration on each kernel installation" "sys-kernel/installkernel[grub]"
- fi
-
- if has_version 'sys-boot/grub:0'; then
- elog "A migration guide for GRUB Legacy users is available:"
- elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
- fi
-
- if has_version sys-boot/os-prober; then
- ewarn "Due to security concerns, os-prober is disabled by default."
- ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-04-04 20:31 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-04-04 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 1a1bb5562a181e4c897d0425f2e51edb5230636d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 20:30:10 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 20:30:49 2024 +0000
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 <floppym <AT> 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} == 9999 ]]; 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} != 9999 ]]; 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-04-04 20:31 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-04-04 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 6133b41226d1ec047cc80c01599a9eca55cd065f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 20:14:52 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 20:30:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6133b412
sys-boot/grub: move PATCHES to src_prepare
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.12-r2.ebuild | 12 ++++++------
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 44bb51e767ee..bfd0dd40817c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-03-27 18:53 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-03-27 18:53 UTC (permalink / raw
To: gentoo-commits
commit: be90a8faa24f70e62d8435a4d5cee66fdc208374
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 18:53:12 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 18:53:12 2024 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-03-27 18:52 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-03-27 18:52 UTC (permalink / raw
To: gentoo-commits
commit: 8bcf8e87210956b638bf3961d2825609e66963ff
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Wed Mar 27 18:45:51 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 18:51:51 2024 +0000
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_gentoo <AT> matoro.tk>
Signed-off-by: Arthur Zamarin <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-03-13 0:54 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2024-03-13 0:54 UTC (permalink / raw
To: gentoo-commits
commit: 1131751a6c75e5245d75871ee863a86185872f3b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 00:53:08 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 00:53:08 2024 +0000
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 <sam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-03-02 11:04 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-03-02 11:04 UTC (permalink / raw
To: gentoo-commits
commit: 09f22f3a8fbd81464e3d120ee37f48e3fcdae14d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 11:04:08 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 11:04:08 2024 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-03-02 10:57 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2024-03-02 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 9044b19a1dae386ac4638d4833272809608aab37
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 10:57:49 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 10:57:49 2024 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-02-15 23:51 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2024-02-15 23:51 UTC (permalink / raw
To: gentoo-commits
commit: e108e12bce523c297c84cfd47d4e1b8cea08cca6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 23:49:27 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 23:49:27 2024 +0000
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 <sam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-02-06 22:32 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2024-02-06 22:32 UTC (permalink / raw
To: gentoo-commits
commit: 19766b9cc2711165936811be968b6d25c2dd7e65
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 22:32:11 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 22:32:11 2024 +0000
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 <sam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-02-04 3:20 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-02-04 3:20 UTC (permalink / raw
To: gentoo-commits
commit: 46792ce3aca3b580570625dc340631f08aed998c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 4 03:18:12 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Feb 4 03:19:14 2024 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 2 +-
sys-boot/grub/grub-2.12-r1.ebuild | 2 +-
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1a4cfde422a0..0ba8261571a5 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-02-02 6:28 Andrew Ammerlaan
0 siblings, 0 replies; 215+ messages in thread
From: Andrew Ammerlaan @ 2024-02-02 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 40be04df7f4b954a8bf48d211e0961567fa4c378
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 12:50:18 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb 2 06:16:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40be04df
sys-boot/grub: add installkernel as optfeature
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 1 +
sys-boot/grub/grub-2.12-r1.ebuild | 1 +
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4146c10c16ea..1a4cfde422a0 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-01-16 17:42 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-01-16 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 943e555b7daa7e1f7164c3b6af2b869c08881fef
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 17:35:29 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 17:35:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943e555b
sys-boot/grub: drop 2.12_rc1-r1
Signed-off-by: Mike Gilbert <floppym <AT> 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="
- https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz
- verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )
- "
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="
- mirror://gnu/${PN}/${P}.tar.xz
- verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
- "
- S=${WORKDIR}/${P%_*}
- fi
- #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"
-fi
-
-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
-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}"
-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-alternatives/cpio
- app-arch/lzop
- app-emulation/qemu
- dev-libs/libisoburn
- sys-apps/miscfiles
- sys-block/parted
- sys-fs/squashfs-tools
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- virtual/pkgconfig
- )
- truetype? ( virtual/pkgconfig )
- verify-sig? ( sec-keys/openpgp-keys-danielkiper )
-"
-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 ) test? ( userpriv )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- elif use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
- fi
- default
-}
-
-src_prepare() {
- default
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- FROM_BOOTSTRAP=1 ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # Workaround for bug 829165.
- filter-ldflags -pie
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- # Force configure to use flex & bison, bug 887211.
- export LEX=flex
- unset YACC
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- local SANDBOX_WRITE=${SANDBOX_WRITE}
- addwrite /dev
- grub_do emake -j1 check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-4 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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 [[ -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 "Re-run grub-mkconfig to update grub.cfg!"
- 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."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-01-16 17:42 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-01-16 17:42 UTC (permalink / raw
To: gentoo-commits
commit: ea9c63b1a6bad848585f082cfba354507f9b620a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 17:35:50 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 17:35:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea9c63b1
sys-boot/grub: drop 2.06-r8
Signed-off-by: Mike Gilbert <floppym <AT> 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="
- https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz
- verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )
- "
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="
- mirror://gnu/${PN}/${P}.tar.xz
- verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
- "
- S=${WORKDIR}/${P%_*}
- fi
- 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
- "${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
-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-alternatives/cpio
- app-arch/lzop
- app-emulation/qemu
- dev-libs/libisoburn
- sys-apps/miscfiles
- sys-block/parted
- sys-fs/squashfs-tools
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- virtual/pkgconfig
- )
- truetype? ( virtual/pkgconfig )
- verify-sig? ( sec-keys/openpgp-keys-danielkiper )
-"
-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 )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- elif use verify-sig; then
- verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
- fi
- default
-}
-
-src_prepare() {
- default
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- FROM_BOOTSTRAP=1 ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # Workaround for bug 829165.
- filter-ldflags -pie
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- # Force configure to use flex & bison, bug 887211.
- export LEX=flex
- unset YACC
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && { addpredict /etc/dfs; addpredict /dev/zfs; }
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-4 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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 [[ -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 "Re-run grub-mkconfig to update grub.cfg!"
- 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."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2024-01-16 17:42 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2024-01-16 17:42 UTC (permalink / raw
To: gentoo-commits
commit: e33d4b0286c7ba1ade27f66ff352ce18e1e3273f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 17:39:58 2024 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 17:39:58 2024 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r9.ebuild | 5 +++++
sys-boot/grub/grub-2.12-r1.ebuild | 5 +++++
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a8801791925e..4146c10c16ea 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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() {
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-12-26 21:39 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2023-12-26 21:39 UTC (permalink / raw
To: gentoo-commits
commit: a83c857e6470b72be0fea84579a8eb2c6fe5ee47
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 26 21:38:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 21:38:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83c857e
sys-boot/grub: sync live
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-boot/grub/grub-2.12-r1.ebuild | 10 ++++++----
sys-boot/grub/grub-9999.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} != 9999 ]]; then
+ inherit verify-sig
+
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
MY_P=${P/_/'~'}
@@ -52,6 +54,7 @@ if [[ ${PV} != 9999 ]]; 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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 04c3b16c7c59..430fb57a1484 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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} != 9999 ]]; then
+ inherit verify-sig
+
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+ 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
+ elif use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
fi
default
}
@@ -216,7 +229,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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-12-26 21:26 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2023-12-26 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 287b32c46ef4a274fe2ae132f5de1af413ffc84a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 20:55:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 26 21:24:12 2023 +0000
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 <zmedico <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/34475
Signed-off-by: Sam James <sam <AT> 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-12-24 11:59 Ulrich Müller
0 siblings, 0 replies; 215+ messages in thread
From: Ulrich Müller @ 2023-12-24 11:59 UTC (permalink / raw
To: gentoo-commits
commit: 8bc59252563080aa83648bdf16dfba6b21d65213
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 11:40:33 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 11:58:52 2023 +0000
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 <ulm <AT> 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-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8d6f9d06e40d..04c3b16c7c59 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-12-23 1:00 Zac Medico
0 siblings, 0 replies; 215+ messages in thread
From: Zac Medico @ 2023-12-23 1:00 UTC (permalink / raw
To: gentoo-commits
commit: 76418694270557b6feb75381912a39569ee28d45
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 17:10:06 2023 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 00:59:45 2023 +0000
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 <zmedico <AT> 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 000000000000..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} == 9999 ]]; 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} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="
+ https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz
+ verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )
+ "
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+ "
+ S=${WORKDIR}/${P%_*}
+ fi
+ 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"
+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 )
+ 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 )
+ verify-sig? ( sec-keys/openpgp-keys-danielkiper )
+"
+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 ) test? ( userpriv )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ elif use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ else
+ export PYTHON=true
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ FROM_BOOTSTRAP=1 ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+
+ # Avoid error due to extra_deps.lst missing from source tarball:
+ # make[3]: *** No rule to make target 'grub-core/extra_deps.lst', needed by 'syminfo.lst'. Stop.
+ echo "depends bli part_gpt" > grub-core/extra_deps.lst || die
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # Workaround for bug 829165.
+ filter-ldflags -pie
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC BUILD_PKG_CONFIG
+
+ # Force configure to use flex & bison, bug 887211.
+ export LEX=flex
+ unset YACC
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ local SANDBOX_WRITE=${SANDBOX_WRITE}
+ addwrite /dev
+ grub_do emake -j1 check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-4 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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 [[ -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 "Re-run grub-mkconfig to update grub.cfg!"
+ 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."
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-12-12 6:30 Viorel Munteanu
0 siblings, 0 replies; 215+ messages in thread
From: Viorel Munteanu @ 2023-12-12 6:30 UTC (permalink / raw
To: gentoo-commits
commit: bcf539340284726bc9546d8b6303d53627325491
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Dec 11 20:03:26 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 06:26:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf53934
sys-boot/grub: Stabilize 2.06-r9 ppc, #915187
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Viorel Munteanu <ceamac <AT> 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 7031db4047e0..107cc65e4768 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-12-11 16:37 WANG Xuerui
0 siblings, 0 replies; 215+ messages in thread
From: WANG Xuerui @ 2023-12-11 16:37 UTC (permalink / raw
To: gentoo-commits
commit: e75b6d56e49cb6cdc29b3b804dd231b8d91a9a08
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 16:25:43 2023 +0000
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 16:35:14 2023 +0000
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 <xen0n <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-10-05 4:47 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-10-05 4:47 UTC (permalink / raw
To: gentoo-commits
commit: e6dcbcd25a2e4c2df04f6d4023f8675abc82ba06
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 04:46:43 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 04:46:43 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-10-05 4:47 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-10-05 4:47 UTC (permalink / raw
To: gentoo-commits
commit: e402336a8edeccba279cc6c0b6491ddb9b1cae89
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 04:46:42 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 04:46:42 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-10-04 19:27 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-10-04 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 1dc4028278f21f9a4abaa9ad2bb99e53b4bf46b6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 4 19:25:25 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 19:27:04 2023 +0000
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 <floppym <AT> 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 000000000000..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} == 9999 ]]; 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} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="
+ https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz
+ verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )
+ "
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="
+ mirror://gnu/${PN}/${P}.tar.xz
+ verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+ "
+ S=${WORKDIR}/${P%_*}
+ fi
+ 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-r3.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 )
+ 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 )
+ verify-sig? ( sec-keys/openpgp-keys-danielkiper )
+"
+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 )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ elif use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ else
+ export PYTHON=true
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ FROM_BOOTSTRAP=1 ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # Workaround for bug 829165.
+ filter-ldflags -pie
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC BUILD_PKG_CONFIG
+
+ # Force configure to use flex & bison, bug 887211.
+ export LEX=flex
+ unset YACC
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-4 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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 [[ -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 "Re-run grub-mkconfig to update grub.cfg!"
+ 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."
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-07-31 16:42 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-07-31 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 223832ac2853b44276ec706d9ff81f8950324f08
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jul 29 23:19:30 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 16:40:27 2023 +0000
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 <xxc3ncoredxx <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> 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} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+ 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
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-07-31 16:42 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-07-31 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 97daf89c0e60fa163c04990d17635cdebd83e579
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jul 29 23:25:58 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 16:40:54 2023 +0000
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 <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32099
Signed-off-by: Mike Gilbert <floppym <AT> 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} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+ 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
popd >/dev/null || die
+ elif use verify-sig; then
+ verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.sig}
fi
default
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-07-11 1:07 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-07-11 1:07 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-07-11 1:07 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-07-11 1:07 UTC (permalink / raw
To: gentoo-commits
commit: 3e5fb448d81388da0f20eef40e0d2a94955941d2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 11 01:07:01 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 01:07:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5fb448
sys-boot/grub: unkeyword 2.12_rc1
Signed-off-by: Mike Gilbert <floppym <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-07-10 1:42 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-07-10 1:42 UTC (permalink / raw
To: gentoo-commits
commit: 6ea9aa8307b9979eaaa990a0ebc8b5f4e5cbf7be
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 01:41:32 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 01:41:32 2023 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r7.ebuild | 1 +
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 359da219ea62..e10ab779e8e6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-05-09 20:23 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-05-09 20:23 UTC (permalink / raw
To: gentoo-commits
commit: 2b0cfe49d1b5602616c3d4705ccb0a0b5ce5ad0f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue May 9 20:13:03 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue May 9 20:13:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0cfe49
sys-boot/grub: drop 2.06-r4
Signed-off-by: Mike Gilbert <floppym <AT> 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
- 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? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # Workaround for bug 829165.
- filter-ldflags -pie
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- # Force configure to use flex & bison, bug 887211.
- export LEX=flex
- unset YACC
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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 [[ -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."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-22 15:15 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: dd144e36363f14b868b123b18c9dc5788818b192
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:14:28 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 15:14:28 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-22 15:15 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: e03f4f3716a5a32fac93bf00cda530b1c06b7586
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:14:37 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 15:14:37 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-22 15:15 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 6eefee6ef94a244c8d22797fccd6337ef2e1d353
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:14:34 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 15:14:34 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-22 15:15 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 9a593c50b066c987650400b2302d7e4f9aaff64b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:14:39 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 15:14:39 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-22 15:15 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: ebef9e1686e0ff2a6f185790505ce3fe3a7038a4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:14:31 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 15:14:31 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-22 15:15 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-22 15:15 UTC (permalink / raw
To: gentoo-commits
commit: a2689ef7b2b0fdbd803fc17784008afc7a6fdbd4
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:14:42 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 15:14:42 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-04-05 3:50 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2023-04-05 3:50 UTC (permalink / raw
To: gentoo-commits
commit: bcb87591142f4c035d35225c5df6cf259b66e6b0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 5 03:50:35 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 5 03:50:35 2023 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-01-17 16:03 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2023-01-17 16:03 UTC (permalink / raw
To: gentoo-commits
commit: b28240ad2f78ec1ff5395432db4def46be7effb3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 15:52:38 2023 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 16:03:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28240ad
sys-boot/grub: clean up autogen.sh handling
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 3f9fdfc128e2..cc531c4c9010 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2023-01-01 3:11 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2023-01-01 3:11 UTC (permalink / raw
To: gentoo-commits
commit: 56e6e30263e56771de876c0e053561a54fd19ed1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 1 03:04:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 1 03:11:06 2023 +0000
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 <sam <AT> gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 5 +++--
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a256108539c8..43b43e84e76b 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-12-20 18:13 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-12-20 18:13 UTC (permalink / raw
To: gentoo-commits
commit: e93067af16c354c35efd3e674b083c5861456038
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:06:50 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:13:02 2022 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r4.ebuild | 5 ++++-
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 477b43363226..a256108539c8 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-12-20 18:13 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-12-20 18:13 UTC (permalink / raw
To: gentoo-commits
commit: dd4f54570ed7c6d99beb16cc2b2b841c30a5a09b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 18:10:40 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 18:12:54 2022 +0000
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 <floppym <AT> 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
- 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}"
-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 )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # Workaround for bug 829165.
- filter-ldflags -pie
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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 [[ -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."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-12-02 7:32 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-12-02 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 4853463636b2cb46f549355e33c99619cc476f97
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 2 07:31:55 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 2 07:31:55 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-19 10:16 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:16 UTC (permalink / raw
To: gentoo-commits
commit: b33374bce7dde218da36d8ce6e1db44cc07aeef2
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:16:01 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:16:01 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-19 10:16 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:16 UTC (permalink / raw
To: gentoo-commits
commit: aba3ceb28022df218618a1bed0de62effe0aff79
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:15:49 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:15:49 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-19 10:16 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:16 UTC (permalink / raw
To: gentoo-commits
commit: f91c85d0bdb795174cded9e212a3cfeada029613
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:15:52 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:15:52 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-19 10:16 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 921246c68a6d98772af3fe54f391edd4884b07f6
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:15:55 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:15:55 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-19 10:16 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:16 UTC (permalink / raw
To: gentoo-commits
commit: d80a0b6eeb5db1b6e2b92e7147d22ba97f88a899
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:15:58 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:15:58 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-19 10:16 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-11-19 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 2ec995ac3c4e45644308180714f2f5bbb5b278d8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 10:15:43 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 10:15:43 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-16 0:43 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-11-16 0:43 UTC (permalink / raw
To: gentoo-commits
commit: c123a73d6ad56ef2aae3d07ca51135e16d33d10f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 00:42:37 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 00:42:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c123a73d
sys-boot/grub: fix pkgcheck warnings
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r3.ebuild | 5 +++--
sys-boot/grub/grub-2.06-r4.ebuild | 5 +++--
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 407e54b6f361..477b43363226 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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="
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-11-16 0:43 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-11-16 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 7f808be26f24a5d938efb272e2d98cd5aa05ecda
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 00:29:40 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 00:29:40 2022 +0000
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 <floppym <AT> 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 000000000000..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} == 9999 ]]; 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} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+ 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 )"
+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 )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ else
+ export PYTHON=true
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # Workaround for bug 829165.
+ filter-ldflags -pie
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC BUILD_PKG_CONFIG
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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 [[ -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."
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-09-26 14:58 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-09-26 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 3b3b5360aaa4a2dafc84037f492e73ff31814fd7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 14:56:43 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 14:58:44 2022 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r3.ebuild | 22 ++++++++++++++++------
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 5aff4addbbee..407e54b6f361 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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."
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-09-02 15:39 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-09-02 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 034c3eb523f406231aefe984560edf432b916f81
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 2 15:39:11 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Sep 2 15:39:11 2022 +0000
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 <floppym <AT> 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..000000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
- 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 )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # Workaround for bug 829165.
- filter-ldflags -pie
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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
- 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/os-prober; then
- ewarn "Due to security concerns, os-prober is disabled by default."
- ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-09-01 22:17 Matt Turner
0 siblings, 0 replies; 215+ messages in thread
From: Matt Turner @ 2022-09-01 22:17 UTC (permalink / raw
To: gentoo-commits
commit: e422941c14ea2ff60b0ee4d97ee49aebd982a767
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 1 22:16:59 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 22:17:11 2022 +0000
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 <mattst88 <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-08-30 5:07 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-08-30 5:07 UTC (permalink / raw
To: gentoo-commits
commit: c460c47bbd2783e74b72def0ac7ff0f6a2efe9c1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 05:06:58 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 05:06:58 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-07-20 21:02 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2022-07-20 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 223051513b4a15bfee55793086ae2978bc7f6337
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 21:02:30 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 21:02:30 2022 +0000
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 <sam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-25 10:35 Arthur Zamarin
0 siblings, 0 replies; 215+ messages in thread
From: Arthur Zamarin @ 2022-06-25 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 4918f07027275f902ca5ad73f8a416fffbeebed1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 10:35:08 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 10:35:08 2022 +0000
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 <arthurzam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-23 5:19 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2022-06-23 5:19 UTC (permalink / raw
To: gentoo-commits
commit: c7a3cac70bf4554cb9e6c4f2ee359c7864dade16
Author: matoro <matoro <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jun 23 04:51:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 05:19:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a3cac7
sys-boot/grub: Stabilize 2.06-r2 sparc, #850673
Signed-off-by: matoro <matoro <AT> users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/26053
Signed-off-by: Sam James <sam <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-20 18:05 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-06-20 18:05 UTC (permalink / raw
To: gentoo-commits
commit: 46befbcce4b5fc28fc20fe93ae466e9fbbc95889
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 18:04:32 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 18:04:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46befbcc
sys-boot/grub: add python 3.11
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r2.ebuild | 2 +-
sys-boot/grub/grub-9999.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} == 9999 ]]; 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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8f568dfed408..5aff4addbbee 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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} == 9999 ]]; 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-20 15:10 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-06-20 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 830e49d291888e4d9ef8fec431a104f7cf9d1e21
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 20 15:08:49 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 15:08:57 2022 +0000
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 <floppym <AT> 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-10 7:11 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2022-06-10 7:11 UTC (permalink / raw
To: gentoo-commits
commit: bd9c84dc3038769b6a79617cd6b89d9b1c843bcc
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 07:11:11 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 07:11:11 2022 +0000
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 <ago <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-10 6:48 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2022-06-10 6:48 UTC (permalink / raw
To: gentoo-commits
commit: 74acc8eb1ed5ddb435d83bf911d36a2a168d8db6
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 06:48:01 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 06:48:01 2022 +0000
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 <ago <AT> 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} != 9999 ]]; 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2022-06-08 1:05 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2022-06-08 1:05 UTC (permalink / raw
To: gentoo-commits
commit: 7bbb9e2ce52ffd701c05daa3752f1fe11ec72f27
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 8 01:02:45 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 01:02:45 2022 +0000
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 <floppym <AT> 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 000000000000..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} == 9999 ]]; 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} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+ 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 )
+ 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 )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ else
+ export PYTHON=true
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # Workaround for bug 829165.
+ filter-ldflags -pie
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC BUILD_PKG_CONFIG
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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
+ 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/os-prober; then
+ ewarn "Due to security concerns, os-prober is disabled by default."
+ ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-12-15 4:56 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-12-15 4:56 UTC (permalink / raw
To: gentoo-commits
commit: 7c1b967ad02495722e66e18e2e6645388cf384e3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 04:54:32 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 04:56:54 2021 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 3 +++
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ba93a504196..8f568dfed408 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-09-16 12:32 Marek Szuba
0 siblings, 0 replies; 215+ messages in thread
From: Marek Szuba @ 2021-09-16 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 2154fad36d773b2fa5a8c11a0ed1977157657557
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 09:29:54 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 12:32:11 2021 +0000
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 <marecki <AT> 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} != 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-09-14 14:02 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-09-14 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 3bd87a8adfebcc22f55823568418f7cb4365a245
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 14 14:00:46 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 14 14:01:57 2021 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 13 +++++++++++++
sys-boot/grub/grub-9999.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} == 9999 ]]; then
GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 119378453e6..7ba93a50419 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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} == 9999 ]]; then
GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-09-07 17:28 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-09-07 17:28 UTC (permalink / raw
To: gentoo-commits
commit: c47fa1eccc311045cb764d891e569fbce1193d1a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 17:27:32 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 17:27:45 2021 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2c6c543dd39..119378453e6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-09-07 17:28 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-09-07 17:28 UTC (permalink / raw
To: gentoo-commits
commit: 763ee6146cd896ad801a3b937d1d21a92b26c5a2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 17:18:04 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 17:27:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763ee614
sys-boot/grub: drop pax-utils
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06-r1.ebuild | 3 +--
sys-boot/grub/grub-9999.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} != 9999 ]]; 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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8046d169817..2c6c543dd39 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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} != 9999 ]]; 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-09-07 17:28 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-09-07 17:28 UTC (permalink / raw
To: gentoo-commits
commit: e8b40aa4bd847dc627ed03a50d50cc80630254a1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 7 16:13:20 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Sep 7 17:27:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b40aa4
sys-boot/grub: drop 2.06_rc1
Signed-off-by: Mike Gilbert <floppym <AT> 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..00000000000
--- 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} == 9999 ]]; 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} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
- 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
- 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 )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-pkg_setup() {
- :
-}
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- else
- export PYTHON=true
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC BUILD_PKG_CONFIG
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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
- 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/os-prober; then
- ewarn "Due to security concerns, os-prober is disabled by default."
- ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-08-11 19:11 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2021-08-11 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 01061f76804b18970086f6f0a94c3e916fc5895b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 19:10:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 19:10:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01061f76
sys-boot/grub: Stabilize 2.06 arm64, #799236
Signed-off-by: Sam James <sam <AT> 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} != 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 sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-06-30 10:56 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-06-30 10:56 UTC (permalink / raw
To: gentoo-commits
commit: 6d81884e201f7b74c4d1c2e073ce58a1ca4871ed
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 10:56:34 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 10:56:34 2021 +0000
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 <ago <AT> 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} != 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 sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-06-30 10:55 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-06-30 10:55 UTC (permalink / raw
To: gentoo-commits
commit: af5ae2c7f2369a7e436e284e601dba833b47d147
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 10:55:44 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 10:55:44 2021 +0000
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 <ago <AT> 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} != 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 ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-06-30 10:55 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-06-30 10:55 UTC (permalink / raw
To: gentoo-commits
commit: be17dedfab83391a587c97ba9d45485963550308
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 10:55:18 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 10:55:18 2021 +0000
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 <ago <AT> 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} != 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 ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-06-30 10:54 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-06-30 10:54 UTC (permalink / raw
To: gentoo-commits
commit: c8382af1f5233b40dc0726b832b710a0edf2cc07
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 10:54:48 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 10:54:48 2021 +0000
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 <ago <AT> 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} != 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 ~sparc ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-06-08 19:59 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-06-08 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 5e82d5f6cdbe4735f4ed355d9798de0154bf5d9a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 8 19:58:29 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 8 19:58:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e82d5f6
sys-boot/grub: add 2.06
Signed-off-by: Mike Gilbert <floppym <AT> 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 00000000000..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} == 9999 ]]; 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} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
+ 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
+ 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 )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ else
+ export PYTHON=true
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC BUILD_PKG_CONFIG
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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
+ 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/os-prober; then
+ ewarn "Due to security concerns, os-prober is disabled by default."
+ ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-04-22 19:50 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-04-22 19:50 UTC (permalink / raw
To: gentoo-commits
commit: c7bc3f0d07449fe4f86c9065cf9ffa5f2644a02d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 19:49:04 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 19:49:04 2021 +0000
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 <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4f50f14c6ff..8046d169817 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -8,13 +8,14 @@ if [[ ${PV} == 9999 ]]; 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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-04-21 3:38 Matt Turner
0 siblings, 0 replies; 215+ messages in thread
From: Matt Turner @ 2021-04-21 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 897eaba917ed0d65a8b499318075097ed6379418
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 21 03:37:04 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 21 03:38:27 2021 +0000
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 <mattst88 <AT> 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} != 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 sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-04-04 18:55 Andreas Sturmlechner
0 siblings, 0 replies; 215+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 18:55 UTC (permalink / raw
To: gentoo-commits
commit: 41f6e6a7d99fee6d9ca6bba51304a6157bcd4cd8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 3 11:02:43 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 18:55:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41f6e6a7
sys-boot/grub: Drop superfluous optfeature header
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index dc9469d354a..4f50f14c6ff 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-28 7:14 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2021-03-28 7:14 UTC (permalink / raw
To: gentoo-commits
commit: c95ee8bd6ca802b5616ffa79f1d336120f4ff92d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 07:10:05 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 07:10:05 2021 +0000
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 <sam <AT> 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} != 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 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-27 18:25 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-03-27 18:25 UTC (permalink / raw
To: gentoo-commits
commit: d9fe5889872531dc47824cbe1040f645f103ece0
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 18:24:48 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 27 18:24:48 2021 +0000
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 <ago <AT> 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} != 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 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-26 17:51 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-03-26 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 35cba5363289e65fca43c8f34e4d0ef41721200a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 17:51:22 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 17:51:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35cba536
sys-boot/grub: export BUILD_PKG_CONFIG
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.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-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 2e85d9e0329..dc9469d354a 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.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
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-26 15:16 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-03-26 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 8e4e7696c0c8169634b47581bde9e6bf9b5fad00
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 15:15:58 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 15:16:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4e7696
sys-boot/grub: add warning about os-prober
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 5 +++++
sys-boot/grub/grub-9999.ebuild | 5 +++++
2 files changed, 10 insertions(+)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild b/sys-boot/grub/grub-2.06_rc1.ebuild
index 480010aafdf..88a1c7ee41f 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -293,4 +293,9 @@ pkg_postinst() {
optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
optfeature "Enable RAID device detection" sys-fs/mdadm
fi
+
+ if has_version sys-boot/os-prober; then
+ ewarn "Due to security concerns, os-prober is disabled by default."
+ ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+ fi
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 29c5c03332a..2e85d9e0329 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -293,4 +293,9 @@ pkg_postinst() {
optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
optfeature "Enable RAID device detection" sys-fs/mdadm
fi
+
+ if has_version sys-boot/os-prober; then
+ ewarn "Due to security concerns, os-prober is disabled by default."
+ ewarn "Set GRUB_DISABLE_OS_PROBER=false in /etc/default/grub to enable it."
+ fi
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-26 14:24 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-03-26 14:24 UTC (permalink / raw
To: gentoo-commits
commit: 15baa7575b3951b5e1bc468e62498e8f181d2647
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 14:24:38 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 14:24:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15baa757
sys-boot/grub: amd64 stable wrt bug #773991
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> 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 2d78d4b33e3..480010aafdf 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} != 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 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-26 13:40 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2021-03-26 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 4590cc66ac3c957713f47390e5c42667d1231591
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 13:39:43 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 13:39:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4590cc66
sys-boot/grub: ppc stable wrt bug #773991
Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> 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 50be289b1fe..2d78d4b33e3 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} != 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 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-25 23:17 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2021-03-25 23:17 UTC (permalink / raw
To: gentoo-commits
commit: a216dbe8791347c09b33a656d6358ceb2d3aab18
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 23:16:27 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 23:16:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a216dbe8
sys-boot/grub: Stabilize 2.06_rc1 x86, #773991
Signed-off-by: Sam James <sam <AT> 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 29c5c03332a..50be289b1fe 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} != 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 ~sparc x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-17 14:49 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-03-17 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 7a381a6a8c2e62b0ad7b98dcf57a6b933015487a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 14:39:23 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 14:39:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a381a6a
sys-boot/grub: set PYTHON=true when not running autogen
Since 8b467844e1, configure.ac calls AM_PATH_PYTHON, but this is only
used when re-generating automake input files.
Closes: https://bugs.gentoo.org/776619
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 ++
sys-boot/grub/grub-9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild b/sys-boot/grub/grub-2.06_rc1.ebuild
index 39eb0acc06c..19ad393f721 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -146,6 +146,8 @@ src_prepare() {
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
python_setup
+ else
+ export PYTHON=true
fi
if [[ -n ${GRUB_BOOTSTRAP} ]]; then
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 39eb0acc06c..19ad393f721 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -146,6 +146,8 @@ src_prepare() {
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
python_setup
+ else
+ export PYTHON=true
fi
if [[ -n ${GRUB_BOOTSTRAP} ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-17 14:49 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-03-17 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 44d09884fd64253e9bb1aeeca5114391cb480eef
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 14:38:13 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 14:38:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d09884
sys-boot/grub: stub-out pkg_setup
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 4 ++++
sys-boot/grub/grub-9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/sys-boot/grub/grub-2.06_rc1.ebuild b/sys-boot/grub/grub-2.06_rc1.ebuild
index bae070420bf..39eb0acc06c 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -122,6 +122,10 @@ QA_PRESTRIPPED="usr/lib/grub/.*"
QA_MULTILIB_PATHS="usr/lib/grub/.*"
QA_WX_LOAD="usr/lib/grub/*"
+pkg_setup() {
+ :
+}
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index bae070420bf..39eb0acc06c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -122,6 +122,10 @@ QA_PRESTRIPPED="usr/lib/grub/.*"
QA_MULTILIB_PATHS="usr/lib/grub/.*"
QA_WX_LOAD="usr/lib/grub/*"
+pkg_setup() {
+ :
+}
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-17 14:49 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-03-17 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 43ecf40de66daad94b0b93ba0aae10ee71f0c335
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 17 14:48:34 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 17 14:48:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43ecf40d
sys-boot/grub: drop blocker on grub-static
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.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 19ad393f721..29c5c03332a 100644
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ b/sys-boot/grub/grub-2.06_rc1.ebuild
@@ -111,7 +111,7 @@ RDEPEND="${DEPEND}
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !sys-boot/grub:0 !sys-boot/grub-static
+ !sys-boot/grub:0
nls? ( sys-devel/gettext )
"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 19ad393f721..29c5c03332a 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -111,7 +111,7 @@ RDEPEND="${DEPEND}
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !sys-boot/grub:0 !sys-boot/grub-static
+ !sys-boot/grub:0
nls? ( sys-devel/gettext )
"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2021-03-14 15:34 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2021-03-14 15:34 UTC (permalink / raw
To: gentoo-commits
commit: 69bbad0fc40b225e95b0941b7cc5784703b851db
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 14 15:34:06 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 15:34:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69bbad0f
sys-boot/grub: remove accidentally added ebuild
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.06_rc1.ebuild | 297 -------------------------------------
1 file changed, 297 deletions(-)
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 4a29991e972..00000000000
--- a/sys-boot/grub/grub-2.06_rc1.ebuild
+++ /dev/null
@@ -1,297 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; 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 pax-utils toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${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
-)
-
-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
- 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 !sys-boot/grub-static
- nls? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
-QA_PRESTRIPPED="usr/lib/grub/.*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-QA_WX_LOAD="usr/lib/grub/*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- # Nothing in Gentoo packages 'american-english' in the exact path
- # wanted for the test, but all that is needed is a compressible text
- # file, and we do have 'words' from miscfiles in the same path.
- sed -i \
- -e '/CFILESSRC.*=/s,american-english,words,' \
- tests/util/grub-fs-tester.in \
- || die
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen-pvh) platform=xen_pvh ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-
- # https://bugs.gentoo.org/231935
- dostrip -x /usr/lib/grub
-}
-
-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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-12-29 23:53 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2020-12-29 23:53 UTC (permalink / raw
To: gentoo-commits
commit: 006093c09b1b78fb465810d7f041ac47050db33e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 29 23:53:32 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 23:53:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006093c0
sys-boot/grub: drop dejavu(?!) upstream metadata
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-boot/grub/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index fc870a12f54..a2fdb7a5f07 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -27,7 +27,6 @@
<flag name="truetype">Build and install grub-mkfont conversion utility</flag>
</use>
<upstream>
- <remote-id type="sourceforge">dejavu</remote-id>
<remote-id type="cpe">cpe:/a:gnu:grub</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-11-06 16:14 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-11-06 16:14 UTC (permalink / raw
To: gentoo-commits
commit: b1d47ca57faef307d738f83004fc27b32e252b93
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 16:13:14 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 16:13:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d47ca5
sys-boot/grub: apply libzfs slot-operator to all ebuilds
Bug: https://bugs.gentoo.org/753245
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/{grub-2.04-r1.ebuild => grub-2.04-r2.ebuild} | 2 +-
...grub-2.05_alpha20200310.ebuild => grub-2.05_alpha20200310-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r2.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.04-r1.ebuild
rename to sys-boot/grub/grub-2.04-r2.ebuild
index d0feaf3be6a..e68f15c3a27 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r2.ebuild
@@ -100,7 +100,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
+ libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
similarity index 99%
rename from sys-boot/grub/grub-2.05_alpha20200310.ebuild
rename to sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
index 89d3dd60234..c10aa3ca032 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310-r1.ebuild
@@ -91,7 +91,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
+ libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-11-06 2:45 Georgy Yakovlev
0 siblings, 0 replies; 215+ messages in thread
From: Georgy Yakovlev @ 2020-11-06 2:45 UTC (permalink / raw
To: gentoo-commits
commit: 5e5f1666fcb43c985ca3f610b36da25ce14ba979
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 02:41:41 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 02:43:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e5f1666
sys-boot/grub: add subslot dep on zfs in live ebuild
Bug: https://bugs.gentoo.org/753245
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index b02798b5977..4a29991e972 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -99,7 +99,7 @@ DEPEND="
sdl? ( media-libs/libsdl )
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
+ libzfs? ( sys-fs/zfs:= )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-10-20 18:28 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-10-20 18:28 UTC (permalink / raw
To: gentoo-commits
commit: 5ffc093d9e14966f59d98b6aa23df3cb5229b844
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 18:27:54 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 18:27:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffc093d
sys-boot/grub: adjust sdl dependency
Closes: https://bugs.gentoo.org/750257
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 4 +++-
sys-boot/grub/grub-2.05_alpha20200310.ebuild | 4 +++-
sys-boot/grub/grub-9999.ebuild | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 01e987158d7..d0feaf3be6a 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -96,7 +96,9 @@ BDEPEND="
DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- sdl? ( media-libs/libsdl )
+ grub_platforms_emu? (
+ sdl? ( media-libs/libsdl )
+ )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
index 10b297a9471..89d3dd60234 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
@@ -87,7 +87,9 @@ BDEPEND="
DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- sdl? ( media-libs/libsdl )
+ grub_platforms_emu? (
+ sdl? ( media-libs/libsdl )
+ )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 0a411aea7e6..b02798b5977 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -95,7 +95,9 @@ BDEPEND="
DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- sdl? ( media-libs/libsdl )
+ grub_platforms_emu? (
+ sdl? ( media-libs/libsdl )
+ )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-09-30 18:41 Matt Turner
0 siblings, 0 replies; 215+ messages in thread
From: Matt Turner @ 2020-09-30 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 5ac76d969d40f0e0b24cebe907ed56e8a5443f55
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 18:40:36 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 18:40:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac76d96
sys-boot/grub: Stabilize 2.05_alpha20200310 sparc
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-boot/grub/grub-2.05_alpha20200310.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
index 72d09292ff8..10b297a9471 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
@@ -22,7 +22,7 @@ inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils toolchai
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- 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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-09-07 8:55 David Seifert
0 siblings, 0 replies; 215+ messages in thread
From: David Seifert @ 2020-09-07 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 2f9d0a27d4455b599bd0743b83b8e984aebf6324
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 08:54:06 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 08:54:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f9d0a27
sys-boot/grub: Inherit optfeature.eclass
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
sys-boot/grub/grub-2.05_alpha20200310.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index ef4bd3028b8..01e987158d7 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
index aeab60f11e1..72d09292ff8 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d94f9b72464..0a411aea7e6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 flag-o-matic multibuild optfeature pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-08-05 0:14 Sam James
0 siblings, 0 replies; 215+ messages in thread
From: Sam James @ 2020-08-05 0:14 UTC (permalink / raw
To: gentoo-commits
commit: 6f6433ca7322316d5fae67860f384d8521982e59
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 5 00:13:29 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 5 00:13:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6433ca
sys-boot/grub: arm64 stable (bug #730184)
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 5d09c7bf0cf..ef4bd3028b8 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-05-09 15:57 Thomas Deutschmann
0 siblings, 0 replies; 215+ messages in thread
From: Thomas Deutschmann @ 2020-05-09 15:57 UTC (permalink / raw
To: gentoo-commits
commit: 72ae09f08096094e8a2ae17b56d47f76fd59e415
Author: Roy Yang <royyang <AT> google <DOT> com>
AuthorDate: Sat May 9 01:36:26 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May 9 15:57:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ae09f0
Fixed CPE tag for sys-boot/grub
Signed-off-by: Roy Yang <royyang <AT> google.com>
Closes: https://github.com/gentoo/gentoo/pull/15726
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-boot/grub/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 3e1c75953e4..fc870a12f54 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -28,5 +28,6 @@
</use>
<upstream>
<remote-id type="sourceforge">dejavu</remote-id>
+ <remote-id type="cpe">cpe:/a:gnu:grub</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-04-19 2:35 Craig Andrews
0 siblings, 0 replies; 215+ messages in thread
From: Craig Andrews @ 2020-04-19 2:35 UTC (permalink / raw
To: gentoo-commits
commit: 7dea007fbb561e2928074f1d03c84f301e3272e7
Author: neeshy <neeshy <AT> tfwno <DOT> gf>
AuthorDate: Wed Mar 25 19:36:52 2020 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 02:35:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dea007f
sys-boot/grub: add python3_8 target
Signed-off-by: Nima Sadeghi <neeshy <AT> tfwno.gf>
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
sys-boot/grub/grub-2.05_alpha20200310.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index bb96453cd6a..5d09c7bf0cf 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
fi
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+ PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
inherit python-any-r1
fi
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
index d11a7ec3e89..aeab60f11e1 100644
--- a/sys-boot/grub/grub-2.05_alpha20200310.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
fi
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+ PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
inherit python-any-r1
fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 6de5a47a2cb..d94f9b72464 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
fi
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+ PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
inherit python-any-r1
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-03-15 18:34 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-03-15 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 32f82a6239e5284d91dcd6e2f84968c1aa2e9f7b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 18:29:59 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 18:34:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f82a62
sys-boot/grub: new snapshot 2.05_alpha20200310
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.05_alpha20200310.ebuild | 287 +++++++++++++++++++++++++++
2 files changed, 288 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 46884c72bb2..6493cd098a8 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,5 +3,6 @@ DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673e
DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c
DIST grub-2.05_alpha20200228.tar.xz 6619176 BLAKE2B 15f45495bfffab71f9e4bccd0c60b48dcedfec7da650ceb3bc66f64ad7331e8ab1f786d04893d81b6c2e61dab6fa1ff47a29afcaa7f92bb478c4b18312311604 SHA512 28e42b0125283d0ef3d415a69699416e83e3ee32d60ffe092b0d03765d150579bd3fb218ed2bbf4877bd802012b409a502e86e825c0d22265252097d20449957
+DIST grub-2.05_alpha20200310.tar.xz 6671372 BLAKE2B 2b9006fe486bb3195f34a3e5d34eaa923e1f295fbb7b815b0adf70ca3000531ff0c250c300f21103cf24144f9e51b96cefc860b7a46c6e31b96d4566db08b027 SHA512 7ddcb7524a4fa60754e3053aae4b033b17ffd740f220d3cbc1e25167ce823c42b1795b4767dabb8920027134769de8cacdafc9a6fe26b4d242590809e3db8725
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-2.05_alpha20200310.ebuild b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
new file mode 100644
index 00000000000..d11a7ec3e89
--- /dev/null
+++ b/sys-boot/grub/grub-2.05_alpha20200310.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ WANT_LIBTOOL=none
+ inherit autotools
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+ 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
+)
+
+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
+ virtual/pkgconfig
+ )
+ truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ 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 !sys-boot/grub-static
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-03-04 22:53 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-03-04 22:53 UTC (permalink / raw
To: gentoo-commits
commit: f10d6dc7b6d6eec582732c11b9ddeab8468da6b8
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Tue Mar 3 17:40:51 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Mar 4 22:52:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f10d6dc7
sys-boot/grub: remove dependency on xen-tools
Bug: https://bugs.gentoo.org/711442
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14829
sys-boot/grub/grub-2.02-r4.ebuild | 2 --
sys-boot/grub/grub-2.04-r1.ebuild | 3 ---
sys-boot/grub/grub-2.05_alpha20200110.ebuild | 3 ---
sys-boot/grub/grub-2.05_alpha20200228.ebuild | 3 ---
sys-boot/grub/grub-9999.ebuild | 3 ---
5 files changed, 14 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index 7cbac60a898..e52a12f5f20 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -94,8 +94,6 @@ DEPEND="${COMMON_DEPEND}
media-libs/freetype:2
virtual/pkgconfig
)
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 1076dff5072..a08398a4c9e 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -103,9 +103,6 @@ DEPEND="
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
"
RDEPEND="${DEPEND}
kernel_linux? (
diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
index fa6feb071bb..b0e9cfe178b 100644
--- a/sys-boot/grub/grub-2.05_alpha20200110.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
@@ -94,9 +94,6 @@ DEPEND="
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
"
RDEPEND="${DEPEND}
kernel_linux? (
diff --git a/sys-boot/grub/grub-2.05_alpha20200228.ebuild b/sys-boot/grub/grub-2.05_alpha20200228.ebuild
index 5113020cc33..d11a7ec3e89 100644
--- a/sys-boot/grub/grub-2.05_alpha20200228.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200228.ebuild
@@ -94,9 +94,6 @@ DEPEND="
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
"
RDEPEND="${DEPEND}
kernel_linux? (
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 81eecd9ce3c..6de5a47a2cb 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -102,9 +102,6 @@ DEPEND="
truetype? ( media-libs/freetype:2= )
ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
"
RDEPEND="${DEPEND}
kernel_linux? (
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-03-01 19:29 Matt Turner
0 siblings, 0 replies; 215+ messages in thread
From: Matt Turner @ 2020-03-01 19:29 UTC (permalink / raw
To: gentoo-commits
commit: b88479552ab4e2e28ee122fa7efac6193219c386
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 19:27:32 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 19:28:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8847955
sys-boot/grub-2.05_alpha20200228: add ~sparc
Closes: https://bugs.gentoo.org/667850
Closes: https://bugs.gentoo.org/667852
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
sys-boot/grub/grub-2.05_alpha20200228.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.05_alpha20200228.ebuild b/sys-boot/grub/grub-2.05_alpha20200228.ebuild
index fa6feb071bb..5113020cc33 100644
--- a/sys-boot/grub/grub-2.05_alpha20200228.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200228.ebuild
@@ -22,7 +22,7 @@ inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-fu
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 11169247dcc..81eecd9ce3c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-03-01 18:05 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-03-01 18:05 UTC (permalink / raw
To: gentoo-commits
commit: c58fd356e668022d76ea78f8852faf225695fc1b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 1 18:05:22 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Mar 1 18:05:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c58fd356
sys-boot/grub: new snapshot
Package-Manager: Portage-2.3.89_p9, Repoman-2.3.20_p79
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.05_alpha20200228.ebuild | 290 +++++++++++++++++++++++++++
2 files changed, 291 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 4c9b21dad96..46884c72bb2 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.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c
+DIST grub-2.05_alpha20200228.tar.xz 6619176 BLAKE2B 15f45495bfffab71f9e4bccd0c60b48dcedfec7da650ceb3bc66f64ad7331e8ab1f786d04893d81b6c2e61dab6fa1ff47a29afcaa7f92bb478c4b18312311604 SHA512 28e42b0125283d0ef3d415a69699416e83e3ee32d60ffe092b0d03765d150579bd3fb218ed2bbf4877bd802012b409a502e86e825c0d22265252097d20449957
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-2.05_alpha20200228.ebuild b/sys-boot/grub/grub-2.05_alpha20200228.ebuild
new file mode 100644
index 00000000000..fa6feb071bb
--- /dev/null
+++ b/sys-boot/grub/grub-2.05_alpha20200228.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ WANT_LIBTOOL=none
+ inherit autotools
+fi
+
+inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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
+)
+
+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
+ virtual/pkgconfig
+ )
+ truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ 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 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
+"
+RDEPEND="${DEPEND}
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !sys-boot/grub:0 !sys-boot/grub-static
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-02-16 20:24 David Seifert
0 siblings, 0 replies; 215+ messages in thread
From: David Seifert @ 2020-02-16 20:24 UTC (permalink / raw
To: gentoo-commits
commit: e2121e9ea3f523842e31a99154441dbf8e3c2c30
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 20:24:17 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 20:24:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2121e9e
sys-boot/grub: [QA] inherit eutils.eclass directly
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-boot/grub/grub-2.02-r4.ebuild | 2 +-
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
sys-boot/grub/grub-2.05_alpha20200110.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index c76287b5738..71b3ef340d0 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -16,7 +16,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index bdc25eef77b..b7569f41dca 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
index 488d6c8219e..8a7a3e9847e 100644
--- a/sys-boot/grub/grub-2.05_alpha20200110.ebuild
+++ b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 292e60b093f..96bf1230f63 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+inherit bash-completion-r1 eutils flag-o-matic multibuild pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-13 9:12 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2020-01-13 9:12 UTC (permalink / raw
To: gentoo-commits
commit: ed6d7ae2a6945d7b54590d438e301ab5d490e944
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 09:12:44 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 09:12:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6d7ae2
sys-boot/grub: x86 stable wrt bug #705296
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 9a532a22030..bdc25eef77b 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-13 9:10 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2020-01-13 9:10 UTC (permalink / raw
To: gentoo-commits
commit: ea1e229e4ec31033b41f6e70985ae9857a96aeb1
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 09:10:52 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 09:10:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea1e229e
sys-boot/grub: ia64 stable wrt bug #705296
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 2f6671843e2..9a532a22030 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-13 9:06 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2020-01-13 9:06 UTC (permalink / raw
To: gentoo-commits
commit: 14ee341736e6acd48419c42cbb86a6febaf6b236
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 09:06:07 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 09:06:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ee3417
sys-boot/grub: ppc64 stable wrt bug #705296
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 7cd9af2a34f..2f6671843e2 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-13 9:04 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2020-01-13 9:04 UTC (permalink / raw
To: gentoo-commits
commit: 19c520097416bb7c493c70fdb96f237d6668dc6d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 09:04:51 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 09:04:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c52009
sys-boot/grub: ppc stable wrt bug #705296
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 3ccdd94afdc..7cd9af2a34f 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-13 8:45 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2020-01-13 8:45 UTC (permalink / raw
To: gentoo-commits
commit: ac5c887166614f002a8692f71473f2b27a3003c9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 08:45:52 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jan 13 08:45:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac5c8871
sys-boot/grub: amd64 stable wrt bug #705296
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 52df10939ea..3ccdd94afdc 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-12 17:29 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-01-12 17:29 UTC (permalink / raw
To: gentoo-commits
commit: a3e7315c6495627efa5eb094e21201ecf80575e7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 17:29:08 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 17:29:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e7315c
sys-boot/grub: new snapshot
Closes: https://bugs.gentoo.org/705168
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.05_alpha20200110.ebuild | 291 +++++++++++++++++++++++++++
2 files changed, 292 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index f281cf017cc..4c9b21dad96 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.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
+DIST grub-2.05_alpha20200110.tar.xz 5452588 BLAKE2B ccf95644bc76f6be8e73a25e1b5f05e052ea5bc0c61896454c211fccaec6a714dbae10f7398aa1e9d7bf864efc68655708c102ba20cc1e40fecd3fa7d3d961f7 SHA512 b6e609edc4dcee5d9348d1d6d9ecfec5a759a284a1f82970b38f8aab0c8fa6b5dc69e532a1a264815208df5dae3bf409c2f73846893a8e3cb97187d0e0c7295c
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-2.05_alpha20200110.ebuild b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
new file mode 100644
index 00000000000..488d6c8219e
--- /dev/null
+++ b/sys-boot/grub/grub-2.05_alpha20200110.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ WANT_LIBTOOL=none
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~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
+)
+
+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
+ virtual/pkgconfig
+ )
+ truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ 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 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-pvh? ( app-emulation/xen-tools:= )
+"
+RDEPEND="${DEPEND}
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !sys-boot/grub:0 !sys-boot/grub-static
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen-pvh) platform=xen_pvh ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ # https://bugs.gentoo.org/231935
+ dostrip -x /usr/lib/grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-11 18:30 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-01-11 18:30 UTC (permalink / raw
To: gentoo-commits
commit: e602c405a16e2a8f2b1609a0be09b8ec6f787b8e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 18:30:07 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 18:30:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e602c405
sys-boot/grub: sync live ebuild keywords
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1d91a2c9b90..292e60b093f 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2020-01-11 18:26 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2020-01-11 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 66ff75181e3eee24ac8f887600411b674c41936f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 18:15:45 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 18:26:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ff7518
sys-boot/grub: remove old
Package-Manager: Portage-2.3.84_p2, Repoman-2.3.20_p24
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 2 -
sys-boot/grub/grub-2.04_rc1.ebuild | 306 -------------------------------------
2 files changed, 308 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ce3bb74bbd8..f281cf017cc 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,7 +1,5 @@
DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
-DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3
-DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
deleted file mode 100644
index 4c47c908530..00000000000
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
- GRUB_AUTORECONF=1
- GRUB_BOOTSTRAP=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_{6,7}} )
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- WANT_LIBTOOL=none
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${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 ~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
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.0.01
-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 static 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 )
-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
- virtual/pkgconfig
- )
- truetype? ( virtual/pkgconfig )
-"
-COMMON_DEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- 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 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
-"
-DEPEND="${COMMON_DEPEND}
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !sys-boot/grub:0 !sys-boot/grub-static
- nls? ( sys-devel/gettext )
-"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- pushd "${P}" >/dev/null || die
- local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
- git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
- git-r3_checkout "${GNULIB_URI}" gnulib
- popd >/dev/null || die
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- # Nothing in Gentoo packages 'american-english' in the exact path
- # wanted for the test, but all that is needed is a compressible text
- # file, and we do have 'words' from miscfiles in the same path.
- sed -i \
- -e '/CFILESSRC.*=/s,american-english,words,' \
- tests/util/grub-fs-tester.in \
- || die
-
- if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- python_setup
- fi
-
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- elif [[ -n ${GRUB_AUTOGEN} ]]; then
- ./autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use_enable sdl grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use fonts; then
- ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- fi
-
- if use themes; then
- ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-12-29 19:18 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-12-29 19:18 UTC (permalink / raw
To: gentoo-commits
commit: da4ea6db373056dc9da5209ec60b2850842f06ce
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 19:17:49 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Dec 29 19:17:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4ea6db
sys-boot/grub: update LICENSE
Closes: https://bugs.gentoo.org/662830
Package-Manager: Portage-2.3.82, Repoman-2.3.20_p9
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.02-r4.ebuild | 2 +-
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
sys-boot/grub/grub-2.04_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index acd2c79e379..337ecc9a72d 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -56,7 +56,7 @@ DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+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 multislot nls static sdl test +themes truetype libzfs"
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index e2119933d19..d3c1222ae04 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -51,7 +51,7 @@ DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+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"
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index 545017ee85a..3eadfcfcfbe 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -50,7 +50,7 @@ DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+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 static sdl test +themes truetype libzfs"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 6b165af8248..280a0bc3a90 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -50,7 +50,7 @@ DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+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"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-12-07 11:00 Sergei Trofimovich
0 siblings, 0 replies; 215+ messages in thread
From: Sergei Trofimovich @ 2019-12-07 11:00 UTC (permalink / raw
To: gentoo-commits
commit: 7cd376efbf30d1f3bbcacb30316debf13dc37738
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 10:57:12 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 11:00:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd376ef
sys-boot/grub: ~ia64 keyworded
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-boot/grub/grub-2.02-r4.ebuild | 2 +-
sys-boot/grub/grub-2.04-r1.ebuild | 2 +-
sys-boot/grub/grub-2.04_rc1.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index 2215a61ff45..f590d8c7c11 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild
index 7135f70c7f9..e2119933d19 100644
--- a/sys-boot/grub/grub-2.04-r1.ebuild
+++ b/sys-boot/grub/grub-2.04-r1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index 5970936ad66..545017ee85a 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-12-07 11:00 Sergei Trofimovich
0 siblings, 0 replies; 215+ messages in thread
From: Sergei Trofimovich @ 2019-12-07 11:00 UTC (permalink / raw
To: gentoo-commits
commit: f0a641c1f8cada944e349a3efac29be931ac6876
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 7 10:59:14 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Dec 7 11:00:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a641c1
sys-boot/grub: stable 2.02-r4 for ia64
As a test successfully converted guppy ia64 dev box from elilo to grub.
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-boot/grub/grub-2.02-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index f590d8c7c11..acd2c79e379 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 ia64 ppc ppc64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-07-10 15:03 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-07-10 15:03 UTC (permalink / raw
To: gentoo-commits
commit: fa27222e4717fd840b5034b1170321265b7c2079
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 15:03:05 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 15:03:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa27222e
sys-boot/grub: add bug ref for dostrip call
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.04.ebuild | 1 +
sys-boot/grub/grub-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/sys-boot/grub/grub-2.04.ebuild b/sys-boot/grub/grub-2.04.ebuild
index 567c2927112..07f21fac670 100644
--- a/sys-boot/grub/grub-2.04.ebuild
+++ b/sys-boot/grub/grub-2.04.ebuild
@@ -274,6 +274,7 @@ src_install() {
insinto /etc/default
newins "${FILESDIR}"/grub.default-3 grub
+ # https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 567c2927112..07f21fac670 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -274,6 +274,7 @@ src_install() {
insinto /etc/default
newins "${FILESDIR}"/grub.default-3 grub
+ # https://bugs.gentoo.org/231935
dostrip -x /usr/lib/grub
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-07-08 23:36 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-07-08 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 802461d65b02af50f2da5dd61ae85dd4540b8f07
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 18:33:11 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 23:36:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802461d6
sys-boot/grub: update to unifont 12.1.02
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a4e5b75373b..2ebc46a4173 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -2,4 +2,5 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aea
DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3
DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
+DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index b169b758922..6d7bb2a57e4 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-12.0.01
+UNIFONT=unifont-12.1.02
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-07-08 23:36 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-07-08 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 5bfa1715fb9b0d6f53b88637ea68eecb4ffa861d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 20:13:11 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 23:36:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfa1715
sys-boot/grub: use dostrip
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 6d7bb2a57e4..567c2927112 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -114,11 +114,12 @@ RDEPEND="${DEPEND}
nls? ( sys-devel/gettext )
"
-RESTRICT="strip !test? ( test )"
+RESTRICT="!test? ( test )"
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
src_unpack() {
if [[ ${PV} == 9999 ]]; then
@@ -272,6 +273,8 @@ src_install() {
insinto /etc/default
newins "${FILESDIR}"/grub.default-3 grub
+
+ dostrip -x /usr/lib/grub
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-07-08 23:36 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-07-08 23:36 UTC (permalink / raw
To: gentoo-commits
commit: 9988d21c4e5bc63fb46f6585eae482904a5a3c60
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 23:35:00 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 23:36:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9988d21c
sys-boot/grub: bump to 2.04
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.04.ebuild | 296 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 297 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 2ebc46a4173..ce3bb74bbd8 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.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
+DIST grub-2.04.tar.xz 6393864 BLAKE2B 413ffb9aaeae1ee3128032914ca426a1a5adb3737895dfe563fdde5a7e0386ac2dbc2f7ddfc4e0a67b3ad90494985d6886c20054b038701feb743e67e2eed9d0 SHA512 9c15c42d0cf5d61446b752194e3b628bb04be0fe6ea0240ab62b3d753784712744846e1f7c3651d8e0968d22012e6d713c38c44936d4004ded3ca4d4007babbb
DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3
DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
diff --git a/sys-boot/grub/grub-2.04.ebuild b/sys-boot/grub/grub-2.04.ebuild
new file mode 100644
index 00000000000..567c2927112
--- /dev/null
+++ b/sys-boot/grub/grub-2.04.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ WANT_LIBTOOL=none
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="mirror://gnu-alpha/${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 ~ppc ~ppc64 ~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
+)
+
+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 fonts? ( GPL-2-with-font-exception ) themes? ( 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 )
+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
+ virtual/pkgconfig
+ )
+ truetype? ( virtual/pkgconfig )
+"
+DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ 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 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+"
+RDEPEND="${DEPEND}
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !sys-boot/grub:0 !sys-boot/grub-static
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="!test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub-emu* usr/lib/grub/*"
+QA_PRESTRIPPED="usr/lib/grub/.*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+QA_WX_LOAD="usr/lib/grub/*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use_enable sdl grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+
+ dostrip -x /usr/lib/grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-07-08 23:36 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-07-08 23:36 UTC (permalink / raw
To: gentoo-commits
commit: a2cc45b4f4161260a9a5e956c52b3cd4ae889c92
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 18:25:11 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 23:36:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2cc45b4
sys-boot/grub: drop 'static' use flag
Closes: https://bugs.gentoo.org/566632
Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 5970936ad66..b169b758922 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -92,7 +92,7 @@ BDEPEND="
)
truetype? ( virtual/pkgconfig )
"
-COMMON_DEPEND="
+DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
sdl? ( media-libs/libsdl )
@@ -105,18 +105,7 @@ COMMON_DEPEND="
grub_platforms_xen? ( app-emulation/xen-tools:= )
grub_platforms_xen-32? ( app-emulation/xen-tools:= )
"
-DEPEND="${COMMON_DEPEND}
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
- )
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
kernel_linux? (
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -245,8 +234,6 @@ src_configure() {
export HOST_LDFLAGS=${LDFLAGS}
unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
- use static && HOST_LDFLAGS+=" -static"
-
tc-ld-disable-gold #439082 #466536 #526348
export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
unset LDFLAGS
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-06-26 18:37 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-06-26 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 88796cf18e3cf94ca3c23f694eaffd90cf217a19
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 26 18:37:27 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 26 18:37:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88796cf1
sys-boot/grub: drop debug USE flag, fix sdl dependency
Closes: https://bugs.gentoo.org/682830
Package-Manager: Portage-2.3.67_p12, Repoman-2.3.14_p7
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.02-r4.ebuild | 9 +++------
sys-boot/grub/grub-2.04_rc1.ebuild | 9 +++------
sys-boot/grub/grub-9999.ebuild | 9 +++------
3 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r4.ebuild b/sys-boot/grub/grub-2.02-r4.ebuild
index e7fdf86942f..2215a61ff45 100644
--- a/sys-boot/grub/grub-2.02-r4.ebuild
+++ b/sys-boot/grub/grub-2.02-r4.ebuild
@@ -58,7 +58,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -75,9 +75,7 @@ REQUIRED_USE="
COMMON_DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
+ sdl? ( media-libs/libsdl )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
@@ -211,14 +209,13 @@ grub_configure() {
--program-prefix=
--libdir="${EPREFIX}"/usr/lib
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
$(use_enable device-mapper)
$(use_enable mount grub-mount)
$(use_enable nls)
$(use_enable themes grub-themes)
$(use_enable truetype grub-mkfont)
$(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
+ $(use_enable sdl grub-emu-sdl)
${platform:+--with-platform=}${platform}
# Let configure detect this where supported
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index 38c9444f69a..5970936ad66 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -95,9 +95,7 @@ BDEPEND="
COMMON_DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
+ sdl? ( media-libs/libsdl )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
@@ -211,14 +209,13 @@ grub_configure() {
--program-prefix=
--libdir="${EPREFIX}"/usr/lib
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
$(use_enable device-mapper)
$(use_enable mount grub-mount)
$(use_enable nls)
$(use_enable themes grub-themes)
$(use_enable truetype grub-mkfont)
$(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
+ $(use_enable sdl grub-emu-sdl)
${platform:+--with-platform=}${platform}
# Let configure detect this where supported
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 38c9444f69a..5970936ad66 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount nls static sdl test +themes truetype libzfs"
+IUSE="device-mapper doc efiemu +fonts mount nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -95,9 +95,7 @@ BDEPEND="
COMMON_DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
+ sdl? ( media-libs/libsdl )
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
@@ -211,14 +209,13 @@ grub_configure() {
--program-prefix=
--libdir="${EPREFIX}"/usr/lib
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
$(use_enable device-mapper)
$(use_enable mount grub-mount)
$(use_enable nls)
$(use_enable themes grub-themes)
$(use_enable truetype grub-mkfont)
$(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
+ $(use_enable sdl grub-emu-sdl)
${platform:+--with-platform=}${platform}
# Let configure detect this where supported
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-05-03 19:05 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-05-03 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 0156a5297a430ac3d03dec630e82ed2e278c1494
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 3 19:05:25 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 3 19:05:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0156a529
sys-boot/grub: EAPI 7 (again)
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.04_rc1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index 4c20d004b21..38c9444f69a 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} == 9999 ]]; then
GRUB_AUTORECONF=1
@@ -108,7 +108,6 @@ COMMON_DEPEND="
grub_platforms_xen-32? ( app-emulation/xen-tools:= )
"
DEPEND="${COMMON_DEPEND}
- ${BDEPEND}
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-04-18 1:01 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-04-18 1:01 UTC (permalink / raw
To: gentoo-commits
commit: 61ddf130e305539f82d94eadc4df4cab4b1729d4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 01:00:50 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 01:00:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61ddf130
sys-boot/grub: update PYTHON_COMPAT
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.02-r3.ebuild | 2 +-
sys-boot/grub/grub-2.04_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild
index a3912cbaaa4..343fae3197d 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r3.ebuild
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_5,3_6} )
+ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit python-any-r1
fi
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index ea280cda33e..4c20d004b21 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
fi
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_5,3_6} )
+ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit python-any-r1
fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index cebb2c42027..38c9444f69a 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
fi
if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_5,3_6} )
+ PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit python-any-r1
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-04-15 16:14 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-04-15 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 3cdcb499cafcbe550a8cabf769d38b62be8da812
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 15:52:46 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 15:54:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdcb499
sys-boot/grub: move keywords forward
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.04_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index 1a043112525..c9e78a10095 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 1a043112525..c9e78a10095 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-04-15 16:14 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-04-15 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 7b6f7d86b31bfc401614c2d6a2e3c9808559c5be
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 15:50:47 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 15:54:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6f7d86
sys-boot/grub: bump to 2.04_rc1
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.04_rc1.ebuild | 309 +++++++++++++++++++++++++++++++++++++
2 files changed, 310 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 6dca1dcd23a..a4e5b75373b 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.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
+DIST grub-2.04~rc1.tar.xz 6422420 BLAKE2B cf189fea32badba00051734d4e67954009bae016a6b8a366ce41a2ac8ddf8792e2b63262c0a80f1fa5771394ebc76b090f50eac1ccd9f81d594feb8cc15ab400 SHA512 c0bee6a7aced0408d7477fdb8b6fdd3ec48f80f0ecc4e7602d76f9a37081fe08e405faa030b4e4f181f45793641b13f398fe0bed121058ad8729f9a8908703d3
DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
new file mode 100644
index 00000000000..1a043112525
--- /dev/null
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+ inherit python-any-r1
+fi
+
+if [[ -n ${GRUB_AUTORECONF} ]]; then
+ WANT_LIBTOOL=none
+ inherit autotools
+fi
+
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~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
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-12.0.01
+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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount nls static 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 )
+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
+ virtual/pkgconfig
+ )
+ truetype? ( virtual/pkgconfig )
+"
+COMMON_DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ debug? (
+ 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 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ app-arch/xz-utils[static-libs(+)]
+ truetype? (
+ app-arch/bzip2[static-libs(+)]
+ media-libs/freetype[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !sys-boot/grub:0 !sys-boot/grub-static
+ nls? ( sys-devel/gettext )
+"
+
+RESTRICT="strip !test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ pushd "${P}" >/dev/null || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
+ python_setup
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
+ fi
+
+ if [[ -n ${GRUB_AUTORECONF} ]]; then
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable debug mm-debug)
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use sdl && use_enable debug grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
+ if use themes; then
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ use static && HOST_LDFLAGS+=" -static"
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-04-15 16:14 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-04-15 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 01ae9744580a775ba1e1e7d4e5fd1caad0903069
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 15 16:13:58 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Apr 15 16:13:58 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01ae9744
sys-boot/grub: revert to EAPI 6 due to base-system policy
Package-Manager: Portage-2.3.62_p4, Repoman-2.3.12_p87
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.04_rc1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.04_rc1.ebuild b/sys-boot/grub/grub-2.04_rc1.ebuild
index c9e78a10095..bddc23b8178 100644
--- a/sys-boot/grub/grub-2.04_rc1.ebuild
+++ b/sys-boot/grub/grub-2.04_rc1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=6
if [[ ${PV} == 9999 ]]; then
GRUB_AUTORECONF=1
@@ -108,6 +108,7 @@ COMMON_DEPEND="
grub_platforms_xen-32? ( app-emulation/xen-tools:= )
"
DEPEND="${COMMON_DEPEND}
+ ${BDEPEND}
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 15:55 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 4f3038ea9d242d281bf24b550f40682867cc4143
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 15:55:11 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 15:55:11 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3038ea
sys-boot/grub: fix unifont handling
Closes: https://bugs.gentoo.org/681134
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ae9bb427d9..1a043112525 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -136,11 +136,12 @@ QA_MULTILIB_PATHS="usr/lib/grub/.*"
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
- cd "${P}" || die
+ pushd "${P}" >/dev/null || die
local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
fi
default
}
@@ -224,10 +225,12 @@ grub_configure() {
$(usex efiemu '' '--disable-efiemu')
)
- # Set up font symlinks
- mv "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
if use themes; then
- mv "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
fi
local ECONF_SOURCE="${S}"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 4:29 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 4:29 UTC (permalink / raw
To: gentoo-commits
commit: d4e0d4f83e33dd6e60134bba5d384ba799b1046b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 04:26:19 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 04:26:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e0d4f8
sys-boot/grub: unifont 12.0.01
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-9999.ebuild | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 106fa33c0a5..6dca1dcd23a 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.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
+DIST unifont-12.0.01.pcf.gz 1360857 BLAKE2B ab87e58aee2295e52dc49b7bb131793ad775abbf49f4b64758045a9b5158e75afd01a8425b56e6f6d0ba288a733bf426df363c1ecc78daddec516c33d461bc3b SHA512 9d34a005dd10f212e43075beb71eb39b9cc3403ae1cddec7d79af91b3a3a1beb4a3696075cc94563c8402efe2ad05de552ace77a24da09f1c0b7f95e99b056a3
DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 22f563f6114..4de2f017c33 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.06
+UNIFONT=unifont-12.0.01
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -225,9 +225,9 @@ grub_configure() {
)
# Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ mv "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ mv "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
fi
local ECONF_SOURCE="${S}"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 4:29 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 4:29 UTC (permalink / raw
To: gentoo-commits
commit: 94db4d57fa4045ef90e9394f5821f51e60505939
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 04:28:09 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 04:28:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94db4d57
sys-boot/grub: redirect stdout while sourcing bootstrap.conf
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 4de2f017c33..7ae9bb427d9 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -138,7 +138,7 @@ src_unpack() {
git-r3_src_unpack
cd "${P}" || die
local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
- local GNULIB_REVISION=$(source bootstrap.conf; echo "${GNULIB_REVISION}")
+ local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
git-r3_checkout "${GNULIB_URI}" gnulib
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 4:29 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 4:29 UTC (permalink / raw
To: gentoo-commits
commit: 1c2650e3424d6676a346aa7abdfea67ff24fce0b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 04:20:12 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 04:20:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c2650e3
sys-boot/grub: drop multislot USE flag
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index dea453ed94f..22f563f6114 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -52,7 +52,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
@@ -123,7 +123,7 @@ RDEPEND="${COMMON_DEPEND}
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
+ !sys-boot/grub:0 !sys-boot/grub-static
nls? ( sys-devel/gettext )
"
@@ -150,11 +150,6 @@ src_prepare() {
sed -i -e /autoreconf/d autogen.sh || die
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
# Nothing in Gentoo packages 'american-english' in the exact path
# wanted for the test, but all that is needed is a compressible text
# file, and we do have 'words' from miscfiles in the same path.
@@ -229,10 +224,6 @@ grub_configure() {
$(usex efiemu '' '--disable-efiemu')
)
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
# Set up font symlinks
ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
if use themes; then
@@ -292,10 +283,6 @@ src_install() {
einstalldocs
- if use multislot; then
- mv "${ED}"/usr/share/info/grub{,2}.info || die
- fi
-
insinto /etc/default
newins "${FILESDIR}"/grub.default-3 grub
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 4:29 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 4:29 UTC (permalink / raw
To: gentoo-commits
commit: 6c5b8442cca0ee8ba9173106628abcf9a14fc56a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 04:18:45 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 04:18:45 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5b8442
sys-boot/grub: EAPI 7
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 58 +++++++++++++++++++++---------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index c35bda09b14..dea453ed94f 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ ${PV} == 9999 ]]; then
GRUB_AUTORECONF=1
@@ -64,22 +64,7 @@ REQUIRED_USE="
grub_platforms_loongson? ( fonts )
"
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-COMMON_DEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- 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 )
-"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
${PYTHON_DEPS}
app-misc/pax-utils
sys-devel/flex
@@ -90,17 +75,6 @@ DEPEND="${COMMON_DEPEND}
media-libs/freetype:2
virtual/pkgconfig
)
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
- )
test? (
app-admin/genromfs
app-arch/cpio
@@ -118,6 +92,32 @@ DEPEND="${COMMON_DEPEND}
)
truetype? ( virtual/pkgconfig )
"
+COMMON_DEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ debug? (
+ 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 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+"
+DEPEND="${COMMON_DEPEND}
+ static? (
+ app-arch/xz-utils[static-libs(+)]
+ truetype? (
+ app-arch/bzip2[static-libs(+)]
+ media-libs/freetype[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
+ )
+ )
+"
RDEPEND="${COMMON_DEPEND}
kernel_linux? (
grub_platforms_efi-32? ( sys-boot/efibootmgr )
@@ -293,7 +293,7 @@ src_install() {
einstalldocs
if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+ mv "${ED}"/usr/share/info/grub{,2}.info || die
fi
insinto /etc/default
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 3:39 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 3:39 UTC (permalink / raw
To: gentoo-commits
commit: 5e01aacf1d9da5517378b85d4e660bf51244e805
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 03:38:48 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 03:38:48 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e01aacf
sys-boot/grub: remove old
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.02-r1.ebuild | 311 -------------------------------------
sys-boot/grub/grub-2.02-r2.ebuild | 312 --------------------------------------
2 files changed, 623 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
deleted file mode 100644
index 95b66ff669f..00000000000
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GRUB_AUTOGEN=1
-GRUB_AUTORECONF=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- WANT_LIBTOOL=none
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${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 x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/2.02-multiple-early-initrd.patch
- "${FILESDIR}"/2.02-freetype-capitalise-variables.patch
- "${FILESDIR}"/2.02-freetype-pkg-config.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-COMMON_DEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- 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 sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${COMMON_DEPEND}
- ${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
- )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- 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 )
-"
-RDEPEND="${COMMON_DEPEND}
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- # Nothing in Gentoo packages 'american-english' in the exact path
- # wanted for the test, but all that is needed is a compressible text
- # file, and we do have 'words' from miscfiles in the same path.
- sed -i \
- -e '/CFILESSRC.*=/s,american-english,words,' \
- tests/util/grub-fs-tester.in \
- || die
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- autopoint() { :; }
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- # Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-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
- 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
- fi
-}
diff --git a/sys-boot/grub/grub-2.02-r2.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild
deleted file mode 100644
index 0075aa08c23..00000000000
--- a/sys-boot/grub/grub-2.02-r2.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GRUB_AUTOGEN=1
-GRUB_AUTORECONF=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
- inherit python-any-r1
-fi
-
-if [[ -n ${GRUB_AUTORECONF} ]]; then
- WANT_LIBTOOL=none
- inherit autotools
-fi
-
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${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 ~ppc64 ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/2.02-multiple-early-initrd.patch
- "${FILESDIR}"/2.02-freetype-capitalise-variables.patch
- "${FILESDIR}"/2.02-freetype-pkg-config.patch
- "${FILESDIR}"/2.02-xfs-sparse-inodes.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-COMMON_DEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- 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 )
-"
-DEPEND="${COMMON_DEPEND}
- ${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
- )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- 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 )
-"
-RDEPEND="${COMMON_DEPEND}
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- # Nothing in Gentoo packages 'american-english' in the exact path
- # wanted for the test, but all that is needed is a compressible text
- # file, and we do have 'words' from miscfiles in the same path.
- sed -i \
- -e '/CFILESSRC.*=/s,american-english,words,' \
- tests/util/grub-fs-tester.in \
- || die
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${GRUB_AUTORECONF} ]]; then
- autopoint() { :; }
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- # Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 3:39 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 3:39 UTC (permalink / raw
To: gentoo-commits
commit: 598e8b3f76a437208ff1a34e33aa68dd8d518475
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 03:38:07 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 03:38:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=598e8b3f
sys-boot/grub: 2.02-r3 stable on amd64 and x86
Closes: https://bugs.gentoo.org/681008
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-2.02-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild
index f40c9c79529..8067036a24c 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 3:26 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 3:26 UTC (permalink / raw
To: gentoo-commits
commit: 1e3d98c3aaf9844b67bc0b0b97011626abd394e6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 03:19:44 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 03:19:44 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e3d98c3
sys-boot/grub: adjust bootstrap logic
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 0663509415e..c35bda09b14 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -4,12 +4,11 @@
EAPI=6
if [[ ${PV} == 9999 ]]; then
- GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
GRUB_BOOTSTRAP=1
fi
-if [[ -n ${GRUB_AUTOGEN} ]]; then
+if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
inherit python-any-r1
fi
@@ -164,14 +163,15 @@ src_prepare() {
tests/util/grub-fs-tester.in \
|| die
- if [[ -n ${GRUB_AUTOGEN} ]]; then
+ if [[ -n ${GRUB_AUTOGEN} || -n ${GRUB_BOOTSTRAP} ]]; then
python_setup
- if [[ -n ${GRUB_BOOTSTRAP} ]]; then
- eautopoint --force
- AUTOPOINT=: AUTORECONF=: ./bootstrap || die
- else
- ./autogen.sh || die
- fi
+ fi
+
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ elif [[ -n ${GRUB_AUTOGEN} ]]; then
+ ./autogen.sh || die
fi
if [[ -n ${GRUB_AUTORECONF} ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-03-21 3:12 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2019-03-21 3:12 UTC (permalink / raw
To: gentoo-commits
commit: bddcef62229d2a58f04924e848a014980e6f47bf
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 03:10:59 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 03:10:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bddcef62
sys-boot/grub: bootstrap gnulib in the live ebuild
Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
sys-boot/grub/grub-9999.ebuild | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 662c83807ee..0663509415e 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,6 +6,7 @@ EAPI=6
if [[ ${PV} == 9999 ]]; then
GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
+ GRUB_BOOTSTRAP=1
fi
if [[ -n ${GRUB_AUTOGEN} ]]; then
@@ -136,6 +137,11 @@ QA_MULTILIB_PATHS="usr/lib/grub/.*"
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
+ cd "${P}" || die
+ local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
+ local GNULIB_REVISION=$(source bootstrap.conf; echo "${GNULIB_REVISION}")
+ git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
+ git-r3_checkout "${GNULIB_URI}" gnulib
fi
default
}
@@ -160,11 +166,15 @@ src_prepare() {
if [[ -n ${GRUB_AUTOGEN} ]]; then
python_setup
- bash autogen.sh || die
+ if [[ -n ${GRUB_BOOTSTRAP} ]]; then
+ eautopoint --force
+ AUTOPOINT=: AUTORECONF=: ./bootstrap || die
+ else
+ ./autogen.sh || die
+ fi
fi
if [[ -n ${GRUB_AUTORECONF} ]]; then
- autopoint() { :; }
eautoreconf
fi
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2019-02-10 1:27 Lars Wendler
0 siblings, 0 replies; 215+ messages in thread
From: Lars Wendler @ 2019-02-10 1:27 UTC (permalink / raw
To: gentoo-commits
commit: 6c5a7f46de195bcc783af484309943b4bb03cef6
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 01:26:40 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 10 01:26:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5a7f46
sys-boot/grub: Cleanup metadata.xml
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-boot/grub/metadata.xml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 9070bcc5502..68e6175af8d 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -1,15 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer restrict=">=sys-boot/grub-2" type="person">
+<maintainer type="person">
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
- <description>GRUB2 only - do not assign bugs related to GRUB Legacy (0.97)</description>
-</maintainer>
-<maintainer restrict="<sys-boot/grub-1" type="person">
- <email>axs@gentoo.org</email>
- <name>Ian Stakenvicius</name>
- <description>GRUB-Legacy only - do not assign bugs related to GRUB2</description>
</maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-11-28 9:58 Michał Górny
0 siblings, 0 replies; 215+ messages in thread
From: Michał Górny @ 2018-11-28 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 8d9edd14d6a554a96aa1597ce7a4467ac097389c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 11:57:40 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 09:58:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9edd14
sys-boot/grub: Make USE=netboot local
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-boot/grub/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 9070bcc5502..b6247282548 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -33,6 +33,7 @@
Allow concurrent installation of <pkg>sys-boot/grub</pkg> SLOT 0 and
<pkg>sys-boot/grub</pkg> SLOT 2 by renaming all programs.
</flag>
+ <flag name="netboot">Enable network booting</flag>
<flag name="themes">Build and install GRUB themes (starfield)</flag>
<flag name="truetype">Build and install grub-mkfont conversion utility</flag>
</use>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-11-18 11:27 Mikle Kolyada
0 siblings, 0 replies; 215+ messages in thread
From: Mikle Kolyada @ 2018-11-18 11:27 UTC (permalink / raw
To: gentoo-commits
commit: 931a6189b607c85a0d83ce84bb1f56cef36275d4
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 11:26:54 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 11:27:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931a6189
sys-boot/grub: Add ~arm keyword wrt bug #548942
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
sys-boot/grub/grub-2.02-r1.ebuild | 4 ++--
sys-boot/grub/grub-2.02-r2.ebuild | 4 ++--
sys-boot/grub/grub-2.02-r3.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 8b9bd593a87..95b66ff669f 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
diff --git a/sys-boot/grub/grub-2.02-r2.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild
index 01c56fe388a..0075aa08c23 100644
--- a/sys-boot/grub/grub-2.02-r2.ebuild
+++ b/sys-boot/grub/grub-2.02-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild
index 2295c88af72..f40c9c79529 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ppc ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-09-14 5:56 Matt Turner
0 siblings, 0 replies; 215+ messages in thread
From: Matt Turner @ 2018-09-14 5:56 UTC (permalink / raw
To: gentoo-commits
commit: 88da23ee25b92b585362696420115ec027566f10
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 05:54:07 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:54:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88da23ee
sys-boot/grub-2.02-r3: ppc stable
sys-boot/grub/grub-2.02-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild
index 0f25e02f5ce..2295c88af72 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r3.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ppc ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-09-13 3:42 Matt Turner
0 siblings, 0 replies; 215+ messages in thread
From: Matt Turner @ 2018-09-13 3:42 UTC (permalink / raw
To: gentoo-commits
commit: 5514fca0a4708c41ded3156e1ac8194f34e10982
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 03:41:10 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 03:42:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5514fca0
sys-boot/grub-2.02-r3: ppc64 stable
sys-boot/grub/grub-2.02-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02-r3.ebuild b/sys-boot/grub/grub-2.02-r3.ebuild
index a2712785195..0f25e02f5ce 100644
--- a/sys-boot/grub/grub-2.02-r3.ebuild
+++ b/sys-boot/grub/grub-2.02-r3.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-08-13 14:55 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-08-13 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 78627c4a102f3f65a9fd644ca46d718ef28c188f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 14:54:40 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 14:54:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78627c4a
sys-boot/grub: sync live ebuild
Package-Manager: Portage-2.3.45_p0_p471020, Repoman-2.3.10_p30_p471020
sys-boot/grub/grub-9999.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 43d920a97cc..662c83807ee 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -30,7 +30,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
@@ -76,8 +76,8 @@ COMMON_DEPEND="
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+ ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+ ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-08-13 14:43 Luca Barbato
0 siblings, 0 replies; 215+ messages in thread
From: Luca Barbato @ 2018-08-13 14:43 UTC (permalink / raw
To: gentoo-commits
commit: 5e142d5f4c5f0722433e9a50c10785c6ab0a9b24
Author: Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 13 14:42:05 2018 +0000
Commit: Luca Barbato <lu_zero <AT> gentoo <DOT> org>
CommitDate: Mon Aug 13 14:42:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e142d5f
sys-boot/grub: Make it available to ppc64
Tested on Integricloud.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
sys-boot/grub/grub-2.02-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r2.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild
index 2b29ae72752..01c56fe388a 100644
--- a/sys-boot/grub/grub-2.02-r2.ebuild
+++ b/sys-boot/grub/grub-2.02-r2.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
@@ -79,8 +79,8 @@ COMMON_DEPEND="
libzfs? ( sys-fs/zfs )
mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+ ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
+ ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-07-01 14:00 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-07-01 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 27df2b27cc24205d2a09d916d255d5cacdce3709
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 1 14:00:42 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Jul 1 14:00:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27df2b27
sys-boot/grub: add python3.6 support
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247
sys-boot/grub/grub-2.02-r1.ebuild | 2 +-
sys-boot/grub/grub-2.02-r2.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 01ea55f70e5..8b9bd593a87 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
inherit python-any-r1
fi
diff --git a/sys-boot/grub/grub-2.02-r2.ebuild b/sys-boot/grub/grub-2.02-r2.ebuild
index bc92a886e21..2b29ae72752 100644
--- a/sys-boot/grub/grub-2.02-r2.ebuild
+++ b/sys-boot/grub/grub-2.02-r2.ebuild
@@ -7,7 +7,7 @@ GRUB_AUTOGEN=1
GRUB_AUTORECONF=1
if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
inherit python-any-r1
fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index e540b36db34..43d920a97cc 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
fi
if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
inherit python-any-r1
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-06-26 14:45 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-06-26 14:45 UTC (permalink / raw
To: gentoo-commits
commit: c1f0d4e92885b07b5e4c7dc0031b0a5f1377da0d
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 14:17:47 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 14:45:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f0d4e9
sys-boot/grub: add slot to fuse dep
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247
sys-boot/grub/grub-2.02-r1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index c1bcb5ffedf..01ea55f70e5 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -76,7 +76,7 @@ COMMON_DEPEND="
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
+ mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d6d3d47e7c5..e540b36db34 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -74,7 +74,7 @@ COMMON_DEPEND="
)
device-mapper? ( >=sys-fs/lvm2-2.02.45 )
libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
+ mount? ( sys-fs/fuse:0 )
truetype? ( media-libs/freetype:2= )
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-06-26 14:45 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-06-26 14:45 UTC (permalink / raw
To: gentoo-commits
commit: f600b926ab58aef41b30b7da0a2185185b947ebd
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 14:14:56 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 14:45:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f600b926
sys-boot/grub: remove old
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247
sys-boot/grub/grub-2.02.ebuild | 298 -----------------------------------------
1 file changed, 298 deletions(-)
diff --git a/sys-boot/grub/grub-2.02.ebuild b/sys-boot/grub/grub-2.02.ebuild
deleted file mode 100644
index 44db1517a9f..00000000000
--- a/sys-boot/grub/grub-2.02.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- GRUB_AUTOGEN=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
- WANT_LIBTOOL=none
- inherit autotools python-any-r1
-fi
-
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 ~arm64 x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- 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
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- # Nothing in Gentoo packages 'american-english' in the exact path
- # wanted for the test, but all that is needed is a compressible text
- # file, and we do have 'words' from miscfiles in the same path.
- sed -i \
- -e '/CFILESSRC.*=/s,american-english,words,' \
- tests/util/grub-fs-tester.in \
- || die
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- autopoint() { :; }
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- # Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-06-26 14:45 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-06-26 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 5b347c06f9e08bbdf4631c1fe2715019ffeab8cd
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 14:16:53 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 14:45:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b347c06
sys-boot/grub: drop versionator
Package-Manager: Portage-2.3.40_p15, Repoman-2.3.9_p247
sys-boot/grub/grub-2.02-r1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index c8bd4fb84d9..c1bcb5ffedf 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -16,7 +16,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8c33dc3f4bb..d6d3d47e7c5 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-05-07 19:46 Mikle Kolyada
0 siblings, 0 replies; 215+ messages in thread
From: Mikle Kolyada @ 2018-05-07 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 914e99eeb31ca0b2cbafe9d5661132ea980507ab
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 19:46:09 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 7 19:46:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=914e99ee
sys-boot/grub: amd64 stable wrt bug #655200
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-boot/grub/grub-2.02-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index a46992543e4..c8bd4fb84d9 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 x86"
+ KEYWORDS="amd64 ~arm64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-05-07 19:40 Thomas Deutschmann
0 siblings, 0 replies; 215+ messages in thread
From: Thomas Deutschmann @ 2018-05-07 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 8121b14c7c80ac69836ecbacb0e1c64910c257e0
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon May 7 19:39:54 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon May 7 19:39:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8121b14c
sys-boot/grub: x86 stable (bug #655200)
Package-Manager: Portage-2.3.34, Repoman-2.3.9
sys-boot/grub/grub-2.02-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 03b5f77360f..a46992543e4 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -28,7 +28,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-05-05 23:12 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-05-05 23:12 UTC (permalink / raw
To: gentoo-commits
commit: d0a50caca757eb7f78d5565d7b9bcb84355e5a7a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat May 5 23:08:32 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat May 5 23:11:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a50cac
sys-boot/grub: update git URI
sys-boot/grub/grub-9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d4a88468dca..8c33dc3f4bb 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -33,8 +33,7 @@ if [[ ${PV} != 9999 ]]; then
KEYWORDS="~amd64 ~arm64 ~x86"
else
inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/grub.git"
fi
PATCHES=(
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-05-04 21:21 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-05-04 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 72b0011426f858f33aeabb4e211937e29fd3bbc7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 21:21:34 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 4 21:21:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72b00114
sys-boot/grub: drop duplicate autotools inherit
Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116
sys-boot/grub/grub-2.02-r1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 128ecad3b62..03b5f77360f 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -16,7 +16,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index cd0b6d92607..d4a88468dca 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -18,7 +18,7 @@ if [[ -n ${GRUB_AUTORECONF} ]]; then
inherit autotools
fi
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+inherit bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-05-04 21:05 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-05-04 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 3d30735eff2c4ef35fb7da1357967991afe21eb6
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 21:05:03 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 4 21:05:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d30735e
sys-boot/grub: depend on pkgconfig as necessary
Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116
sys-boot/grub/grub-2.02-r1.ebuild | 8 +++++++-
sys-boot/grub/grub-9999.ebuild | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index 5181e64af6d..128ecad3b62 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -88,7 +88,10 @@ DEPEND="${COMMON_DEPEND}
sys-devel/bison
sys-apps/help2man
sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
+ fonts? (
+ media-libs/freetype:2
+ virtual/pkgconfig
+ )
grub_platforms_xen? ( app-emulation/xen-tools:= )
grub_platforms_xen-32? ( app-emulation/xen-tools:= )
static? (
@@ -97,6 +100,7 @@ DEPEND="${COMMON_DEPEND}
app-arch/bzip2[static-libs(+)]
media-libs/freetype[static-libs(+)]
sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
)
)
test? (
@@ -112,7 +116,9 @@ DEPEND="${COMMON_DEPEND}
themes? (
app-arch/unzip
media-libs/freetype:2
+ virtual/pkgconfig
)
+ truetype? ( virtual/pkgconfig )
"
RDEPEND="${COMMON_DEPEND}
kernel_linux? (
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 3b49a8b4802..cd0b6d92607 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -87,7 +87,10 @@ DEPEND="${COMMON_DEPEND}
sys-devel/bison
sys-apps/help2man
sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
+ fonts? (
+ media-libs/freetype:2
+ virtual/pkgconfig
+ )
grub_platforms_xen? ( app-emulation/xen-tools:= )
grub_platforms_xen-32? ( app-emulation/xen-tools:= )
static? (
@@ -96,6 +99,7 @@ DEPEND="${COMMON_DEPEND}
app-arch/bzip2[static-libs(+)]
media-libs/freetype[static-libs(+)]
sys-libs/zlib[static-libs(+)]
+ virtual/pkgconfig
)
)
test? (
@@ -111,7 +115,9 @@ DEPEND="${COMMON_DEPEND}
themes? (
app-arch/unzip
media-libs/freetype:2
+ virtual/pkgconfig
)
+ truetype? ( virtual/pkgconfig )
"
RDEPEND="${COMMON_DEPEND}
kernel_linux? (
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-05-04 21:05 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2018-05-04 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 82a00bab274f589c8efa35bfce7342429c12295a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 21:00:13 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 4 21:05:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a00bab
sys-boot/grub: cleanup DEPEND/RDEPEND
Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116
sys-boot/grub/grub-2.02-r1.ebuild | 8 +++-----
sys-boot/grub/grub-9999.ebuild | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/sys-boot/grub/grub-2.02-r1.ebuild b/sys-boot/grub/grub-2.02-r1.ebuild
index d18b6e78cb6..5181e64af6d 100644
--- a/sys-boot/grub/grub-2.02-r1.ebuild
+++ b/sys-boot/grub/grub-2.02-r1.ebuild
@@ -68,7 +68,7 @@ REQUIRED_USE="
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
+COMMON_DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
debug? (
@@ -81,7 +81,7 @@ RDEPEND="
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
app-misc/pax-utils
sys-devel/flex
@@ -114,7 +114,7 @@ DEPEND="${RDEPEND}
media-libs/freetype:2
)
"
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
kernel_linux? (
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -123,8 +123,6 @@ RDEPEND+="
nls? ( sys-devel/gettext )
"
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
RESTRICT="strip !test? ( test )"
QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d5bfc5ad9ac..3b49a8b4802 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -67,7 +67,7 @@ REQUIRED_USE="
# os-prober: Used on runtime to detect other OSes
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
+COMMON_DEPEND="
app-arch/xz-utils
>=sys-libs/ncurses-5.2-r5:0=
debug? (
@@ -80,7 +80,7 @@ RDEPEND="
ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
"
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
app-misc/pax-utils
sys-devel/flex
@@ -113,7 +113,7 @@ DEPEND="${RDEPEND}
media-libs/freetype:2
)
"
-RDEPEND+="
+RDEPEND="${COMMON_DEPEND}
kernel_linux? (
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
@@ -122,8 +122,6 @@ RDEPEND+="
nls? ( sys-devel/gettext )
"
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
RESTRICT="strip !test? ( test )"
QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2018-02-01 20:37 Thomas Deutschmann
0 siblings, 0 replies; 215+ messages in thread
From: Thomas Deutschmann @ 2018-02-01 20:37 UTC (permalink / raw
To: gentoo-commits
commit: 4014188fd1e817dc7960bb4b74496d92db6abf91
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 1 20:27:36 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 1 20:36:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4014188f
sys-boot/grub: x86 stable (bug #639606)
Package-Manager: Portage-2.3.21, Repoman-2.3.6
sys-boot/grub/grub-0.97-r18.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
index a286b4a5527..695b074e304 100644
--- a/sys-boot/grub/grub-0.97-r18.ebuild
+++ b/sys-boot/grub/grub-0.97-r18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting
@@ -30,7 +30,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="custom-cflags ncurses netboot static"
LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-12-31 21:49 Michał Górny
0 siblings, 0 replies; 215+ messages in thread
From: Michał Górny @ 2017-12-31 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 2df3277cb07eb3cddca3d3280a256394fb069e93
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 10:24:21 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 21:48:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df3277c
sys-boot/grub: Stop using awful multijob_* logic
The multijob logic adds a lot of complex, unmaintained and fragile bash
code with little gain. Moreover, makes build logs unreadable
by interspersing output from multiple configure runs.
Bug: https://bugs.gentoo.org/613322
sys-boot/grub/grub-0.97-r16.ebuild | 10 +---------
sys-boot/grub/grub-0.97-r18.ebuild | 10 +---------
2 files changed, 2 insertions(+), 18 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild
index 06d9aa23b12..22793c03ab0 100644
--- a/sys-boot/grub/grub-0.97-r16.ebuild
+++ b/sys-boot/grub/grub-0.97-r16.ebuild
@@ -17,7 +17,7 @@
EAPI="5"
-inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils
PATCHVER="1.14" # Should match the revision ideally
DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -121,12 +121,8 @@ src_configure() {
fi
fi
- multijob_init
-
# build the net-bootable grub first, but only if "netboot" is set
if use netboot ; then
- (
- multijob_child_init
mkdir -p "${WORKDIR}"/netboot
pushd "${WORKDIR}"/netboot >/dev/null
ECONF_SOURCE=${S} \
@@ -141,8 +137,6 @@ src_configure() {
--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
--enable-{tulip,via-rhine,w89c840}
popd >/dev/null
- ) &
- multijob_post_fork
fi
# Now build the regular grub
@@ -156,8 +150,6 @@ src_configure() {
# sanity check due to common failure
use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
-
- multijob_finish
}
src_compile() {
diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
index eb820606143..9d5aeede689 100644
--- a/sys-boot/grub/grub-0.97-r18.ebuild
+++ b/sys-boot/grub/grub-0.97-r18.ebuild
@@ -17,7 +17,7 @@
EAPI="6"
-inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils
PATCHVER="1.15" # Should match the revision ideally
DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -121,12 +121,8 @@ src_configure() {
fi
fi
- multijob_init
-
# build the net-bootable grub first, but only if "netboot" is set
if use netboot ; then
- (
- multijob_child_init
mkdir -p "${WORKDIR}"/netboot
pushd "${WORKDIR}"/netboot >/dev/null
ECONF_SOURCE=${S} \
@@ -141,8 +137,6 @@ src_configure() {
--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
--enable-{tulip,via-rhine,w89c840}
popd >/dev/null
- ) &
- multijob_post_fork
fi
# Now build the regular grub
@@ -156,8 +150,6 @@ src_configure() {
# sanity check due to common failure
use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
-
- multijob_finish
}
src_compile() {
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-12-31 21:49 Michał Górny
0 siblings, 0 replies; 215+ messages in thread
From: Michał Górny @ 2017-12-31 21:49 UTC (permalink / raw
To: gentoo-commits
commit: b7ceb900b3d131f4293ef3c62f00683e0d10cb04
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 31 10:23:15 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 31 21:48:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7ceb900
sys-boot/grub: Drop interim old version (redudant)
sys-boot/grub/grub-0.97-r17.ebuild | 300 -------------------------------------
1 file changed, 300 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
deleted file mode 100644
index b34191f7346..00000000000
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ /dev/null
@@ -1,300 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# XXX: we need to review menu.lst vs grub.conf handling. We've been converting
-# all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-# we never updated any of the source code (it still all wants menu.lst),
-# and there is no indication that upstream is making the transition.
-
-# If you need to roll a new grub-static distfile, here is how.
-# - Robin H. Johnson <robbat2@gentoo.org> - 29 Nov 2010
-# FEATURES='-noauto -noinfo -nodoc -noman -splitdebug nostrip' \
-# USE='static -ncurses -netboot -custom-cflags' \
-# PORTAGE_COMPRESS=true GRUB_STATIC_PACKAGE_BUILDING=1 ebuild \
-# grub-${PVR}.ebuild clean package && \
-# qtbz2 -s -j ${PKGDIR}/${CAT}/${PF}.tbz2 && \
-# mv ${PF}.tar.bz2 ${DISTDIR}/grub-static-${PVR}.tar.bz2
-
-EAPI="5"
-
-inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
-
-PATCHVER="1.14" # Should match the revision ideally
-DESCRIPTION="GNU GRUB Legacy boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
- mirror://gnu-alpha/${PN}/${P}.tar.gz
- mirror://gentoo/splash.xpm.gz
- mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="custom-cflags ncurses netboot static"
-
-LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- static? ( ${LIB_DEPEND} )"
-RDEPEND+=" !sys-boot/grub:2[-multislot]"
-
-pkg_setup() {
- case $(tc-arch) in
- amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
- esac
-}
-
-src_prepare() {
- # Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
- # discovered in bug 160801. We can change this, however, using larger values
- # for this variable means that Grub needs more memory to run and boot. For a
- # kernel of size N, Grub needs (N+1)*2. Advanced users should set a custom
- # value in make.conf, it is possible to make kernels ~16Mb in size, but it
- # needs the kitchen sink built-in.
- local t="custom"
- if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then
- case $(tc-arch) in
- amd64) GRUB_MAX_KERNEL_SIZE=9 ;;
- x86) GRUB_MAX_KERNEL_SIZE=5 ;;
- esac
- t="default"
- fi
- einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
-
- sed -i \
- -e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
- "${S}"/grub/asmstub.c \
- || die
-
- # gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie
- if (( $(gcc-major-version) > 5 )); then
- sed -i 's/-nopie/-no-pie/' \
- "${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \
- || die
- fi
-
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- # bug 564890, 566638
- epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
- epatch "${FILESDIR}"/grub-0.97-ncurses-pkgconfig.patch
-
- epatch_user
-
- rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away
- eautoreconf
-}
-
-src_configure() {
- filter-flags -fPIE #168834
-
- use amd64 && multilib_toolchain_setup x86
-
- unset BLOCK_SIZE #73499
-
- ### i686-specific code in the boot loader is a bad idea; disabling to ensure
- ### at least some compatibility if the hard drive is moved to an older or
- ### incompatible system.
-
- # grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
- # but the objcopy's (faulty) test fails if -fstack-protector is default.
- # create a cache telling configure that objcopy is ok, and add -C to econf
- # to make use of the cache.
- #
- # CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
- # STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
- # -fno-stack-protector detected by configure, removed from netboot's emake.
- use custom-cflags || unset CFLAGS
-
- tc-ld-disable-gold #439082 #466536 #526348
-
- export grub_cv_prog_objcopy_absolute=yes #79734
- use static && append-ldflags -static
-
- if use amd64 && use static ; then
- if [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
- eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This"
- eerror "is specifically intended for building the tarballs for the"
- eerror "grub-static package via USE='static -ncurses'."
- eerror "All bets are now off."
- fi
- fi
-
- multijob_init
-
- # build the net-bootable grub first, but only if "netboot" is set
- if use netboot ; then
- (
- multijob_child_init
- mkdir -p "${WORKDIR}"/netboot
- pushd "${WORKDIR}"/netboot >/dev/null
- ECONF_SOURCE=${S} \
- econf \
- --libdir=/lib \
- --datadir=/usr/lib/grub \
- --exec-prefix=/ \
- --disable-auto-linux-mem-opt \
- --enable-diskless \
- --enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
- --enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
- --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
- --enable-{tulip,via-rhine,w89c840}
- popd >/dev/null
- ) &
- multijob_post_fork
- fi
-
- # Now build the regular grub
- # Note that FFS and UFS2 support are broken for now - stage1_5 files too big
- econf \
- --libdir=/lib \
- --datadir=/usr/lib/grub \
- --exec-prefix=/ \
- --disable-auto-linux-mem-opt \
- $(use_with ncurses curses)
-
- # sanity check due to common failure
- use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
-
- multijob_finish
-}
-
-src_compile() {
- use netboot && emake -C "${WORKDIR}"/netboot w89c840_o_CFLAGS="-O"
- emake
-}
-
-src_test() {
- # non-default block size also give false pass/fails.
- unset BLOCK_SIZE
- emake -j1 check
-}
-
-src_install() {
- default
- if use netboot ; then
- exeinto /usr/lib/grub/${CHOST}
- doexe "${WORKDIR}"/netboot/stage2/{nbgrub,pxegrub}
- newexe "${WORKDIR}"/netboot/stage2/stage2 stage2.netboot
- fi
-
- pax-mark -m "${D}"/sbin/grub #330745
-
- newdoc docs/menu.lst grub.conf.sample
- dodoc "${FILESDIR}"/grub.conf.gentoo
-
- [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] && \
- mv "${D}"/usr/share/doc/{${PF},grub-static-${PF/grub-}}
-
- insinto /usr/share/grub
- doins "${DISTDIR}"/splash.xpm.gz
-}
-
-setup_boot_dir() {
- local boot_dir=$1
- local dir=${boot_dir}
-
- mkdir -p "${dir}"
- [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
- dir="${dir}/grub"
- if [[ ! -e ${dir} ]] ; then
- mkdir "${dir}" || die
- fi
-
- # change menu.lst to grub.conf
- if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
- mv -f "${dir}"/menu.lst "${dir}"/grub.conf
- ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
- echo
- fi
-
- if [[ ! -e ${dir}/menu.lst ]]; then
- einfo "Linking from new grub.conf name to menu.lst"
- ln -snf grub.conf "${dir}"/menu.lst
- fi
-
- if [[ -e ${dir}/stage2 ]] ; then
- mv "${dir}"/stage2{,.old}
- ewarn "*** IMPORTANT NOTE: you must run grub and install"
- ewarn "the new version's stage1 to your MBR. Until you do,"
- ewarn "stage1 and stage2 will still be the old version, but"
- ewarn "later stages will be the new version, which could"
- ewarn "cause problems such as an unbootable system."
- ewarn
- ewarn "This means you must use either grub-install or perform"
- ewarn "root/setup manually."
- ewarn
- ewarn "For more help, see the wiki:"
- ewarn "https://wiki.gentoo.org/wiki/GRUB"
- echo
- fi
-
- einfo "Copying files from /lib/grub and /usr/share/grub to ${dir}"
- for x in \
- "${ROOT}"/lib*/grub/*/* \
- "${ROOT}"/usr/share/grub/* ; do
- [[ -f ${x} ]] && cp -p "${x}" "${dir}"/
- done
-
- if [[ ! -e ${dir}/grub.conf ]] ; then
- s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
- [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
- [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
- [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
- fi
-
- # Per bug 218599, we support grub.conf.install for users that want to run a
- # specific set of Grub setup commands rather than the default ones.
- grub_config=${dir}/grub.conf.install
- [[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
- if [[ -e ${grub_config} ]] ; then
- egrep \
- -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
- "${grub_config}" | \
- /sbin/grub --batch \
- --device-map="${dir}"/device.map \
- > /dev/null
- fi
-
- # the grub default commands silently piss themselves if
- # the default file does not exist ahead of time
- if [[ ! -e ${dir}/default ]] ; then
- grub-set-default --root-directory="${boot_dir}" default
- fi
- einfo "Grub has been installed to ${boot_dir} successfully."
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -n ${DONT_MOUNT_BOOT} ]]; then
- elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
- elog "the following instructions for your /boot!"
- elog "Neglecting to do so may cause your system to fail to boot!"
- elog
- else
- setup_boot_dir "${ROOT}"/boot
- # Trailing output because if this is run from pkg_postinst, it gets mixed into
- # the other output.
- einfo ""
- fi
- elog "To interactively install grub files to another device such as a USB"
- elog "stick, just run the following and specify the directory as prompted:"
- elog " emerge --config =${PF}"
- elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
- elog "grub where to install in a non-interactive way."
-
- # needs to be after we call setup_boot_dir
- mount-boot_pkg_postinst
-}
-
-pkg_config() {
- local dir
- if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
- einfo "Enter the directory where you want to setup grub:"
- read dir
- else
- dir="${GRUB_ALT_INSTALLDIR}"
- fi
- setup_boot_dir "${dir}"
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-12-14 14:53 Thomas Deutschmann
0 siblings, 0 replies; 215+ messages in thread
From: Thomas Deutschmann @ 2017-12-14 14:53 UTC (permalink / raw
To: gentoo-commits
commit: f2acf983ac1f7db57e63f07e9e2efac1a88be5f3
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 14:53:25 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 14:53:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2acf983
sys-boot/grub: Adjust sanity check message
Package-Manager: Portage-2.3.18, Repoman-2.3.6
sys-boot/grub/grub-0.97-r18.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
index a45c190509a..eb820606143 100644
--- a/sys-boot/grub/grub-0.97-r18.ebuild
+++ b/sys-boot/grub/grub-0.97-r18.ebuild
@@ -172,13 +172,13 @@ src_test() {
}
src_install() {
- _stage2_file="${S}/stage2/stage2"
+ local _stage2_file="${S}/stage2/stage2"
if [[ -f "${_stage2_file}" ]]; then
local _stage2_filesize=$(stat -c '%s' "${_stage2_file}" 2>/dev/null)
if [[ -z "${_stage2_filesize}" ]]; then
ewarn "Sanity check skipped -- 'stat' returned nothing"
elif [[ "${_stage2_filesize}" -gt 1000000 ]]; then
- eerror "Sanity check failed: stage2 (${_stage2_file}) is more than 1MB large (${_stage2_filesize} bytes)!"
+ eerror "Sanity check failed: stage2 (${_stage2_file}) is larger than 1MB (${_stage2_filesize} bytes)!"
eerror "Please check your CFLAGS and/or file a bug report at https://bugs.gentoo.org."
die "stage2 sanity check failed"
else
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-12-14 12:00 Thomas Deutschmann
0 siblings, 0 replies; 215+ messages in thread
From: Thomas Deutschmann @ 2017-12-14 12:00 UTC (permalink / raw
To: gentoo-commits
commit: 750afd3aecf8d3bc320aa69f251130fe6959750a
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 11:58:00 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 11:59:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750afd3a
sys-boot/grub: Fix build against 17.0 profile
Ebuild changes:
===============
- EAPI bumped to EAPI=6
- Sanity check for stage2 added
Bug: https://bugs.gentoo.org/608460
Package-Manager: Portage-2.3.18, Repoman-2.3.6
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-0.97-r18.ebuild | 317 +++++++++++++++++++++++++++++++++++++
2 files changed, 318 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index cad6407c329..23837461cb9 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-0.97-patches-1.14.tar.bz2 52916 BLAKE2B 49000402cbdc52bf2bfe31ccc36d0ebc8ba53a58e17bc3a798d3afe5ecec3cc79fb0bb7e786667b96993a7632484b3162e035c358e0fade20ddc2a1ec8e1b073 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26
+DIST grub-0.97-patches-1.15.tar.bz2 52887 BLAKE2B a571fe3b918cad590880a277df6ef1bdf094fbc11fd25b2dfb0d790a6b1b37839460475aebc3d6e4f09f59f969ab42dfd8e2b7472aba31c296ed5e03ba3f1030 SHA512 729a4b62bd04aca5b15b83e87b799e1c7e592a5a0265ec6b7a4f4d4ebde05e3e57b62fb6eed6ee1b7692d5dc43dd9ad65898332ff806557b62a7174a797c251a
DIST grub-0.97.tar.gz 971783 BLAKE2B a7b6feb6dddb6eeb20e027071091b2d37930e5b40687f8c8ff860839db208f832713db61389014d21842e1e152cad0466dc9722a79cbb81bfa1566a30b6b82cc SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb
DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673eef8e8e26bbc18c5ec28829f563b9298874fb96d45a5d523ce366e936649c21ebda7462afda0cc328b970ce SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088
DIST splash.xpm.gz 33856 BLAKE2B e8d0ee91a87ed45f47fa58b07a6476b19ddb3f98ffee41adce46fe9bc4926bbefcac5cd01efc41794049b1c905502b18e69b5f0546bcf3cea79bf351e1817574 SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da
diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
new file mode 100644
index 00000000000..a45c190509a
--- /dev/null
+++ b/sys-boot/grub/grub-0.97-r18.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# XXX: we need to review menu.lst vs grub.conf handling. We've been converting
+# all systems to grub.conf (and symlinking menu.lst to grub.conf), but
+# we never updated any of the source code (it still all wants menu.lst),
+# and there is no indication that upstream is making the transition.
+
+# If you need to roll a new grub-static distfile, here is how.
+# - Robin H. Johnson <robbat2@gentoo.org> - 29 Nov 2010
+# FEATURES='-noauto -noinfo -nodoc -noman -splitdebug nostrip' \
+# USE='static -ncurses -netboot -custom-cflags' \
+# PORTAGE_COMPRESS=true GRUB_STATIC_PACKAGE_BUILDING=1 ebuild \
+# grub-${PVR}.ebuild clean package && \
+# qtbz2 -s -j ${PKGDIR}/${CAT}/${PF}.tbz2 && \
+# mv ${PF}.tar.bz2 ${DISTDIR}/grub-static-${PVR}.tar.bz2
+
+EAPI="6"
+
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
+
+PATCHVER="1.15" # Should match the revision ideally
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+ mirror://gnu-alpha/${PN}/${P}.tar.gz
+ mirror://gentoo/splash.xpm.gz
+ mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2
+ https://dev.gentoo.org/~whissi/dist/${PN}/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="custom-cflags ncurses netboot static"
+
+LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ static? ( ${LIB_DEPEND} )"
+RDEPEND+=" !sys-boot/grub:2[-multislot]"
+
+pkg_setup() {
+ case $(tc-arch) in
+ amd64) CONFIG_CHECK='~IA32_EMULATION' check_extra_config ;;
+ esac
+}
+
+src_prepare() {
+ # Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
+ # discovered in bug 160801. We can change this, however, using larger values
+ # for this variable means that Grub needs more memory to run and boot. For a
+ # kernel of size N, Grub needs (N+1)*2. Advanced users should set a custom
+ # value in make.conf, it is possible to make kernels ~16Mb in size, but it
+ # needs the kitchen sink built-in.
+ local t="custom"
+ if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then
+ case $(tc-arch) in
+ amd64) GRUB_MAX_KERNEL_SIZE=9 ;;
+ x86) GRUB_MAX_KERNEL_SIZE=5 ;;
+ esac
+ t="default"
+ fi
+ einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
+
+ sed -i \
+ -e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
+ "${S}"/grub/asmstub.c \
+ || die
+
+ # gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -fno-pie
+ if [[ tc-is-gcc && $(gcc-major-version) -gt 5 ]]; then
+ sed -i 's/-nopie/-fno-pie/' \
+ "${WORKDIR}"/patch/860_all_grub-0.97-pie-r1.patch \
+ || die
+ fi
+
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+ # bug 564890, 566638
+ epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
+ epatch "${FILESDIR}"/grub-0.97-ncurses-pkgconfig.patch
+
+ eapply_user
+
+ rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away
+ eautoreconf
+}
+
+src_configure() {
+ filter-flags -fPIE #168834
+
+ use amd64 && multilib_toolchain_setup x86
+
+ unset BLOCK_SIZE #73499
+
+ ### i686-specific code in the boot loader is a bad idea; disabling to ensure
+ ### at least some compatibility if the hard drive is moved to an older or
+ ### incompatible system.
+
+ # grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+ # but the objcopy's (faulty) test fails if -fstack-protector is default.
+ # create a cache telling configure that objcopy is ok, and add -C to econf
+ # to make use of the cache.
+ #
+ # CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+ # STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+ # -fno-stack-protector detected by configure, removed from netboot's emake.
+ use custom-cflags || unset CFLAGS
+
+ tc-ld-disable-gold #439082 #466536 #526348
+
+ export grub_cv_prog_objcopy_absolute=yes #79734
+ use static && append-ldflags -static
+
+ if use amd64 && use static ; then
+ if [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] ; then
+ eerror "You have set GRUB_STATIC_PACKAGE_BUILDING. This"
+ eerror "is specifically intended for building the tarballs for the"
+ eerror "grub-static package via USE='static -ncurses'."
+ eerror "All bets are now off."
+ fi
+ fi
+
+ multijob_init
+
+ # build the net-bootable grub first, but only if "netboot" is set
+ if use netboot ; then
+ (
+ multijob_child_init
+ mkdir -p "${WORKDIR}"/netboot
+ pushd "${WORKDIR}"/netboot >/dev/null
+ ECONF_SOURCE=${S} \
+ econf \
+ --libdir=/lib \
+ --datadir=/usr/lib/grub \
+ --exec-prefix=/ \
+ --disable-auto-linux-mem-opt \
+ --enable-diskless \
+ --enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+ --enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+ --enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+ --enable-{tulip,via-rhine,w89c840}
+ popd >/dev/null
+ ) &
+ multijob_post_fork
+ fi
+
+ # Now build the regular grub
+ # Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+ econf \
+ --libdir=/lib \
+ --datadir=/usr/lib/grub \
+ --exec-prefix=/ \
+ --disable-auto-linux-mem-opt \
+ $(use_with ncurses curses)
+
+ # sanity check due to common failure
+ use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
+
+ multijob_finish
+}
+
+src_compile() {
+ use netboot && emake -C "${WORKDIR}"/netboot w89c840_o_CFLAGS="-O"
+ emake
+}
+
+src_test() {
+ # non-default block size also give false pass/fails.
+ unset BLOCK_SIZE
+ emake -j1 check
+}
+
+src_install() {
+ _stage2_file="${S}/stage2/stage2"
+ if [[ -f "${_stage2_file}" ]]; then
+ local _stage2_filesize=$(stat -c '%s' "${_stage2_file}" 2>/dev/null)
+ if [[ -z "${_stage2_filesize}" ]]; then
+ ewarn "Sanity check skipped -- 'stat' returned nothing"
+ elif [[ "${_stage2_filesize}" -gt 1000000 ]]; then
+ eerror "Sanity check failed: stage2 (${_stage2_file}) is more than 1MB large (${_stage2_filesize} bytes)!"
+ eerror "Please check your CFLAGS and/or file a bug report at https://bugs.gentoo.org."
+ die "stage2 sanity check failed"
+ else
+ einfo "stage2 sanity check passed"
+ fi
+ else
+ ewarn "Sanity check skipped -- no stage2 found"
+ fi
+
+ default
+ if use netboot ; then
+ exeinto /usr/lib/grub/${CHOST}
+ doexe "${WORKDIR}"/netboot/stage2/{nbgrub,pxegrub}
+ newexe "${WORKDIR}"/netboot/stage2/stage2 stage2.netboot
+ fi
+
+ pax-mark -m "${D}"/sbin/grub #330745
+
+ newdoc docs/menu.lst grub.conf.sample
+ dodoc "${FILESDIR}"/grub.conf.gentoo
+
+ [[ -n ${GRUB_STATIC_PACKAGE_BUILDING} ]] && \
+ mv "${D}"/usr/share/doc/{${PF},grub-static-${PF/grub-}}
+
+ insinto /usr/share/grub
+ doins "${DISTDIR}"/splash.xpm.gz
+}
+
+setup_boot_dir() {
+ local boot_dir=$1
+ local dir=${boot_dir}
+
+ mkdir -p "${dir}"
+ [[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
+ dir="${dir}/grub"
+ if [[ ! -e ${dir} ]] ; then
+ mkdir "${dir}" || die
+ fi
+
+ # change menu.lst to grub.conf
+ if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
+ mv -f "${dir}"/menu.lst "${dir}"/grub.conf
+ ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+ echo
+ fi
+
+ if [[ ! -e ${dir}/menu.lst ]]; then
+ einfo "Linking from new grub.conf name to menu.lst"
+ ln -snf grub.conf "${dir}"/menu.lst
+ fi
+
+ if [[ -e ${dir}/stage2 ]] ; then
+ mv "${dir}"/stage2{,.old}
+ ewarn "*** IMPORTANT NOTE: you must run grub and install"
+ ewarn "the new version's stage1 to your MBR. Until you do,"
+ ewarn "stage1 and stage2 will still be the old version, but"
+ ewarn "later stages will be the new version, which could"
+ ewarn "cause problems such as an unbootable system."
+ ewarn
+ ewarn "This means you must use either grub-install or perform"
+ ewarn "root/setup manually."
+ ewarn
+ ewarn "For more help, see the wiki:"
+ ewarn "https://wiki.gentoo.org/wiki/GRUB"
+ echo
+ fi
+
+ einfo "Copying files from /lib/grub and /usr/share/grub to ${dir}"
+ for x in \
+ "${ROOT}"/lib*/grub/*/* \
+ "${ROOT}"/usr/share/grub/* ; do
+ [[ -f ${x} ]] && cp -p "${x}" "${dir}"/
+ done
+
+ if [[ ! -e ${dir}/grub.conf ]] ; then
+ s="${ROOT}/usr/share/doc/${PF}/grub.conf.gentoo"
+ [[ -e "${s}" ]] && cat "${s}" >${dir}/grub.conf
+ [[ -e "${s}.gz" ]] && zcat "${s}.gz" >${dir}/grub.conf
+ [[ -e "${s}.bz2" ]] && bzcat "${s}.bz2" >${dir}/grub.conf
+ fi
+
+ # Per bug 218599, we support grub.conf.install for users that want to run a
+ # specific set of Grub setup commands rather than the default ones.
+ grub_config=${dir}/grub.conf.install
+ [[ -e ${grub_config} ]] || grub_config=${dir}/grub.conf
+ if [[ -e ${grub_config} ]] ; then
+ egrep \
+ -v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
+ "${grub_config}" | \
+ /sbin/grub --batch \
+ --device-map="${dir}"/device.map \
+ > /dev/null
+ fi
+
+ # the grub default commands silently piss themselves if
+ # the default file does not exist ahead of time
+ if [[ ! -e ${dir}/default ]] ; then
+ grub-set-default --root-directory="${boot_dir}" default
+ fi
+ einfo "Grub has been installed to ${boot_dir} successfully."
+}
+
+pkg_postinst() {
+ mount-boot_mount_boot_partition
+
+ if [[ -n ${DONT_MOUNT_BOOT} ]]; then
+ elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
+ elog "the following instructions for your /boot!"
+ elog "Neglecting to do so may cause your system to fail to boot!"
+ elog
+ else
+ setup_boot_dir "${ROOT}"/boot
+ # Trailing output because if this is run from pkg_postinst, it gets mixed into
+ # the other output.
+ einfo ""
+ fi
+ elog "To interactively install grub files to another device such as a USB"
+ elog "stick, just run the following and specify the directory as prompted:"
+ elog " emerge --config =${PF}"
+ elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
+ elog "grub where to install in a non-interactive way."
+
+ # needs to be after we call setup_boot_dir
+ mount-boot_pkg_postinst
+}
+
+pkg_config() {
+ local dir
+ if [ ! -d "${GRUB_ALT_INSTALLDIR}" ]; then
+ einfo "Enter the directory where you want to setup grub:"
+ read dir
+ else
+ dir="${GRUB_ALT_INSTALLDIR}"
+ fi
+ setup_boot_dir "${dir}"
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-10-26 20:26 Ian Stakenvicius
0 siblings, 0 replies; 215+ messages in thread
From: Ian Stakenvicius @ 2017-10-26 20:26 UTC (permalink / raw
To: gentoo-commits
commit: fd205ea13d9f7998b8de9b5311d0dcb1c278f76d
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 20:25:49 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 20:26:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd205ea1
sys-boot/grub-0.97-r17: switch -nopie for -no-pie on gcc6+
As the -nopie option was something gentoo patched into gcc via the pie patches
used for hardened, and these patches are not applied to gcc6, the no-pie
patch used with grub:0 needs to be adjusted to hse the new flag when a newer
gcc is used.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
sys-boot/grub/grub-0.97-r17.ebuild | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
index 038a541f879..b34191f7346 100644
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ b/sys-boot/grub/grub-0.97-r17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# XXX: we need to review menu.lst vs grub.conf handling. We've been converting
@@ -67,6 +67,13 @@ src_prepare() {
"${S}"/grub/asmstub.c \
|| die
+ # gcc-6 and above doesnt have a '-nopie' option patched in, use upstream's -no-pie
+ if (( $(gcc-major-version) > 5 )); then
+ sed -i 's/-nopie/-no-pie/' \
+ "${WORKDIR}"/patch/860_all_grub-0.97-pie.patch \
+ || die
+ fi
+
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
# bug 564890, 566638
epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-09-01 20:17 Ian Stakenvicius
0 siblings, 0 replies; 215+ messages in thread
From: Ian Stakenvicius @ 2017-09-01 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 2dfabde7e930d109f9643e70c700e0986a2de576
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 1 20:16:39 2017 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Fri Sep 1 20:17:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dfabde7
sys-boot/grub: update metadata to list me as the maintainer of grub-legacy
Package-Manager: Portage-2.3.6, Repoman-2.3.1
sys-boot/grub/metadata.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 4cafb17e1a6..9070bcc5502 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -6,6 +6,11 @@
<name>Mike Gilbert</name>
<description>GRUB2 only - do not assign bugs related to GRUB Legacy (0.97)</description>
</maintainer>
+<maintainer restrict="<sys-boot/grub-1" type="person">
+ <email>axs@gentoo.org</email>
+ <name>Ian Stakenvicius</name>
+ <description>GRUB-Legacy only - do not assign bugs related to GRUB2</description>
+</maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-07-18 14:56 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-07-18 14:56 UTC (permalink / raw
To: gentoo-commits
commit: 15f30fa97153cce2aadfc3680ab80a1549d4c0ea
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 14:55:45 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 14:56:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15f30fa9
sys-boot/grub: add name/description to my metadata entry
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84
sys-boot/grub/metadata.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 8dc732aa92f..4cafb17e1a6 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer restrict=">=sys-boot/grub-2" type="person">
<email>floppym@gentoo.org</email>
+ <name>Mike Gilbert</name>
+ <description>GRUB2 only - do not assign bugs related to GRUB Legacy (0.97)</description>
</maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-06-22 18:32 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-06-22 18:32 UTC (permalink / raw
To: gentoo-commits
commit: dc39d7b692b39fa398f71b71a6f37b331ccc138f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 18:31:12 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 18:31:12 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc39d7b6
sys-boot/grub: remove old
Package-Manager: Portage-2.3.6_p9, Repoman-2.3.2_p77
sys-boot/grub/Manifest | 9 -
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 323 --------------------------------
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 291 ----------------------------
sys-boot/grub/grub-2.02_rc1.ebuild | 284 ----------------------------
sys-boot/grub/grub-2.02_rc2.ebuild | 298 -----------------------------
5 files changed, 1205 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 029dcd6b340..32b751da264 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,15 +1,6 @@
-DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
-DIST dejavu-sans-ttf-2.35.zip 415463 SHA256 c629bce270e75b6234d5285a739cd186bebc27319993f4b1ea6beb3631810799 SHA512 23c24218da70b3a93fa8c72e8db972b2b881bf3f76056a9315e29162743a8edaf5b699e0a527de121ca5f9efe07243eaf15811db355dba8cca1b92bdd1210732 WHIRLPOOL e3436818e11dab0330bff1a129d1e6fbf670b06a362b353f7bd00388cf46790bde202f1f7dd67b03ad7f9ae7d76098a5a72bc5321f359c2138c4d42c0cebc2aa
DIST dejavu-sans-ttf-2.37.zip 417746 SHA256 5c6e497a2f36552cb5ffb112c413a6af39c0f3c47653662b90b4fa6499822fd7 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae WHIRLPOOL 6f19280e76ea3efe265db09236e94bdd00268c5d8742c191100b8eb19faa532289fb03d838e33aa3c501d8a3243db248648af8929d5d5dba1bfd2ea2c10358cd
DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 WHIRLPOOL a7f5d786064642f926faa444b9db1555ccfbb460655f81a0ca408bc5ad2acfb89fe596f81d161078944ce1b2dc00e82e8fb056f050bf026fc07f6417af7b9776
-DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
-DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
-DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
-DIST grub-2.02~rc1.tar.xz 6051964 SHA256 445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 SHA512 c55a91f43d3c065dc9303fc9ab164910432095a571e28082cbcae646b8b92212f85da22873af99a1a5d7c943c51e2f90837dd2c68abf87ff50bf2e5955877f39 WHIRLPOOL 7ae697d8de28f1e936e49662564900ce82402895a7d3d07c70879c68ed9765ac2e82a89a8d2da4cfb6ecf64cc04c61ff4b889283a2e8abad0c38d86d889a6317
-DIST grub-2.02~rc2.tar.xz 6055836 SHA256 053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 SHA512 00c79c1642ea5d5688a4b59f71315ed72e467f8964e198f0b78f7b95378a07a69087914033bb799e3b1946e0ba116e153c1141ad6a1ea49143203eda3f16b228 WHIRLPOOL 1ab5279113becb33ec2b3339ec584a0ea2021e1edd15a23cca6398eb3499c58846eb4d5b15dae7e08ec69d13146bb50eaf4f7f986084a47c416e43951a52d62b
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
-DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
-DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
deleted file mode 100644
index 22a4044fc58..00000000000
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-GRUB_AUTOGEN=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r3.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default_src_unpack
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-
- epatch "${FILESDIR}"/CVE-2015-8370.patch
- epatch "${FILESDIR}"/${P}-lvm2-raid1.patch
- epatch "${FILESDIR}"/${P}-KERNEL_GLOBS.patch
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
- eautoreconf
- fi
-}
-
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
- fi ;;
- efi-64)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
-
- local grub=grub
- if use multislot; then
- grub=grub2
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
- fi
-
- bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
-
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run $(usex multislot grub2 grub)-install and $(usex multislot grub2 grub)-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_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
- 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
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.02_beta2-r8 ${v}; then
- ewarn "Please re-run $(usex multislot grub2 grub)-install to address a security flaw when using"
- ewarn "username/password authentication in grub."
- ewarn "See bug 568326 for more information."
- fi
- done
- fi
-}
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
deleted file mode 100644
index e9079dbea6e..00000000000
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
- inherit python-any-r1
-fi
-
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
- "${FILESDIR}"/2.02_beta3-10_linux-UUID.patch
- "${FILESDIR}"/2.02_beta3-sysmacros.patch
- "${FILESDIR}"/2.02_beta3-gcc6-ld-no-pie.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.35
-UNIFONT=unifont-8.0.01
-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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="!test? ( test )"
-
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="usr/lib/grub/*"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- autopoint() { :; }
- eautoreconf
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- # Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- dodoc "${FILESDIR}/grub.cfg.example"
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
- elog "For information on how to configure GRUB2 please refer to the guide:"
- elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
- elog
- elog "For manual configuration, see /usr/share/doc/${PF}/grub.cfg.example"
-
- if has_version 'sys-boot/grub:0'; then
- elog
- elog "A migration guide for GRUB Legacy users is available:"
- elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
- fi
-
- 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
- fi
-}
diff --git a/sys-boot/grub/grub-2.02_rc1.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
deleted file mode 100644
index ef61e338186..00000000000
--- a/sys-boot/grub/grub-2.02_rc1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- GRUB_AUTOGEN=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
- WANT_LIBTOOL=none
- inherit autotools python-any-r1
-fi
-
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="~amd64 ~arm64 ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- autopoint() { :; }
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- # Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-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
- 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
- fi
-}
diff --git a/sys-boot/grub/grub-2.02_rc2.ebuild b/sys-boot/grub/grub-2.02_rc2.ebuild
deleted file mode 100644
index cc6db989c6e..00000000000
--- a/sys-boot/grub/grub-2.02_rc2.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- GRUB_AUTOGEN=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
- WANT_LIBTOOL=none
- inherit autotools python-any-r1
-fi
-
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="~amd64 ~arm64 ~x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
- "${FILESDIR}"/gfxpayload.patch
- "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- grub_platforms_xen-32? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- 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
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default
-}
-
-src_prepare() {
- default
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- # Nothing in Gentoo packages 'american-english' in the exact path
- # wanted for the test, but all that is needed is a compressible text
- # file, and we do have 'words' from miscfiles in the same path.
- sed -i \
- -e '/CFILESSRC.*=/s,american-english,words,' \
- tests/util/grub-fs-tester.in \
- || die
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- autopoint() { :; }
- eautoreconf
- fi
-}
-
-grub_do() {
- multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
- multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi*) platform=efi ;;
- xen*) platform=xen ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- case ${MULTIBUILD_VARIANT} in
- *-32)
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=i386
- fi ;;
- *-64)
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=x86_64
- local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- fi ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- # Set up font symlinks
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-
- local ECONF_SOURCE="${S}"
- econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- MULTIBUILD_VARIANTS=()
- local p
- for p in "${GRUB_ALL_PLATFORMS[@]}"; do
- use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
- done
- [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
- grub_do grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- grub_do emake
- use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- grub_do emake check
-}
-
-src_install() {
- grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
- use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
- einstalldocs
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-06-17 17:24 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2017-06-17 17:24 UTC (permalink / raw
To: gentoo-commits
commit: ac0db586ed05578acacfba2c28658d5d05f1ab98
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 17 17:24:11 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jun 17 17:24:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0db586
sys-boot/grub: x86 stable wrt bug #608254
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.02.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02.ebuild b/sys-boot/grub/grub-2.02.ebuild
index 0feba88343e..44db1517a9f 100644
--- a/sys-boot/grub/grub-2.02.ebuild
+++ b/sys-boot/grub/grub-2.02.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-06-16 14:10 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2017-06-16 14:10 UTC (permalink / raw
To: gentoo-commits
commit: b38344e39bf568c13e9f85f584054bee3a8d77b8
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 16 14:09:27 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun 16 14:09:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38344e3
sys-boot/grub: amd64 stable wrt bug #608254
Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.02.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02.ebuild b/sys-boot/grub/grub-2.02.ebuild
index cc6db989c6e..0feba88343e 100644
--- a/sys-boot/grub/grub-2.02.ebuild
+++ b/sys-boot/grub/grub-2.02.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-04-27 17:14 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-04-27 17:14 UTC (permalink / raw
To: gentoo-commits
commit: 8650552ece6002017d20834603f422589c01fdd4
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 17:13:38 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 17:14:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8650552e
sys-boot/grub: bump to 2.02
Package-Manager: Portage-2.3.5_p31, Repoman-2.3.2_p61
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.02.ebuild | 298 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 299 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b48675c5a3b..029dcd6b340 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,6 +3,7 @@ DIST dejavu-sans-ttf-2.35.zip 415463 SHA256 c629bce270e75b6234d5285a739cd186bebc
DIST dejavu-sans-ttf-2.37.zip 417746 SHA256 5c6e497a2f36552cb5ffb112c413a6af39c0f3c47653662b90b4fa6499822fd7 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae WHIRLPOOL 6f19280e76ea3efe265db09236e94bdd00268c5d8742c191100b8eb19faa532289fb03d838e33aa3c501d8a3243db248648af8929d5d5dba1bfd2ea2c10358cd
DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
+DIST grub-2.02.tar.xz 6113260 SHA256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f SHA512 cc6eb0a42b5c8df2f671cc128ff725afb3ff1f8832a196022e433cf0d3b75decfca2316d0aa5fabea75747d55e88f3d021dd93508563f8ca80fd7b9e7fe1f088 WHIRLPOOL a7f5d786064642f926faa444b9db1555ccfbb460655f81a0ca408bc5ad2acfb89fe596f81d161078944ce1b2dc00e82e8fb056f050bf026fc07f6417af7b9776
DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
diff --git a/sys-boot/grub/grub-2.02.ebuild b/sys-boot/grub/grub-2.02.ebuild
new file mode 100644
index 00000000000..cc6db989c6e
--- /dev/null
+++ b/sys-boot/grub/grub-2.02.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ WANT_LIBTOOL=none
+ inherit autotools python-any-r1
+fi
+
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+
+if [[ ${PV} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
+ http://git.savannah.gnu.org/r/grub.git"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+ grub_platforms_coreboot? ( fonts )
+ grub_platforms_qemu? ( fonts )
+ grub_platforms_ieee1275? ( fonts )
+ grub_platforms_loongson? ( fonts )
+"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ debug? (
+ sdl? ( media-libs/libsdl )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ libzfs? ( sys-fs/zfs )
+ mount? ( sys-fs/fuse )
+ truetype? ( media-libs/freetype:2= )
+ ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+ ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ app-misc/pax-utils
+ sys-devel/flex
+ sys-devel/bison
+ sys-apps/help2man
+ sys-apps/texinfo
+ fonts? ( media-libs/freetype:2 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+ static? (
+ app-arch/xz-utils[static-libs(+)]
+ truetype? (
+ app-arch/bzip2[static-libs(+)]
+ media-libs/freetype[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ )
+ )
+ 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
+ )
+"
+RDEPEND+="
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
+ nls? ( sys-devel/gettext )
+"
+
+DEPEND+=" !!=media-libs/freetype-2.5.4"
+
+RESTRICT="strip !test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ if use multislot; then
+ # fix texinfo file name, bug 416035
+ sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+ fi
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} ]]; then
+ python_setup
+ bash autogen.sh || die
+ autopoint() { :; }
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable debug mm-debug)
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use sdl && use_enable debug grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use multislot; then
+ myeconfargs+=( --program-transform-name="s,grub,grub2," )
+ fi
+
+ # Set up font symlinks
+ ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use themes; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ use static && HOST_LDFLAGS+=" -static"
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ if use multislot; then
+ mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+ fi
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-03-17 21:08 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-03-17 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 1718ff963f06752597d45cb9f5fccec555982f39
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 21:07:11 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 21:07:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1718ff96
sys-boot/grub: bump to 2.02~rc2
Package-Manager: Portage-2.3.4_p24, Repoman-2.3.2_p25
sys-boot/grub/Manifest | 1 +
sys-boot/grub/grub-2.02_rc2.ebuild | 298 +++++++++++++++++++++++++++++++++++++
2 files changed, 299 insertions(+)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 7b7d0b3dc0a..b48675c5a3b 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -7,6 +7,7 @@ DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c2473
DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
DIST grub-2.02~rc1.tar.xz 6051964 SHA256 445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 SHA512 c55a91f43d3c065dc9303fc9ab164910432095a571e28082cbcae646b8b92212f85da22873af99a1a5d7c943c51e2f90837dd2c68abf87ff50bf2e5955877f39 WHIRLPOOL 7ae697d8de28f1e936e49662564900ce82402895a7d3d07c70879c68ed9765ac2e82a89a8d2da4cfb6ecf64cc04c61ff4b889283a2e8abad0c38d86d889a6317
+DIST grub-2.02~rc2.tar.xz 6055836 SHA256 053bfcbe366733e4f5a1baf4eb15e1efd977225bdd323b78087ce5fa172fc246 SHA512 00c79c1642ea5d5688a4b59f71315ed72e467f8964e198f0b78f7b95378a07a69087914033bb799e3b1946e0ba116e153c1141ad6a1ea49143203eda3f16b228 WHIRLPOOL 1ab5279113becb33ec2b3339ec584a0ea2021e1edd15a23cca6398eb3499c58846eb4d5b15dae7e08ec69d13146bb50eaf4f7f986084a47c416e43951a52d62b
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
diff --git a/sys-boot/grub/grub-2.02_rc2.ebuild b/sys-boot/grub/grub-2.02_rc2.ebuild
new file mode 100644
index 00000000000..cc6db989c6e
--- /dev/null
+++ b/sys-boot/grub/grub-2.02_rc2.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ WANT_LIBTOOL=none
+ inherit autotools python-any-r1
+fi
+
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+
+if [[ ${PV} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~arm64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
+ http://git.savannah.gnu.org/r/grub.git"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-9.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+ grub_platforms_coreboot? ( fonts )
+ grub_platforms_qemu? ( fonts )
+ grub_platforms_ieee1275? ( fonts )
+ grub_platforms_loongson? ( fonts )
+"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ debug? (
+ sdl? ( media-libs/libsdl )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ libzfs? ( sys-fs/zfs )
+ mount? ( sys-fs/fuse )
+ truetype? ( media-libs/freetype:2= )
+ ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+ ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ app-misc/pax-utils
+ sys-devel/flex
+ sys-devel/bison
+ sys-apps/help2man
+ sys-apps/texinfo
+ fonts? ( media-libs/freetype:2 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+ static? (
+ app-arch/xz-utils[static-libs(+)]
+ truetype? (
+ app-arch/bzip2[static-libs(+)]
+ media-libs/freetype[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ )
+ )
+ 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
+ )
+"
+RDEPEND+="
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
+ nls? ( sys-devel/gettext )
+"
+
+DEPEND+=" !!=media-libs/freetype-2.5.4"
+
+RESTRICT="strip !test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ if use multislot; then
+ # fix texinfo file name, bug 416035
+ sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+ fi
+
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
+ if [[ -n ${GRUB_AUTOGEN} ]]; then
+ python_setup
+ bash autogen.sh || die
+ autopoint() { :; }
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi*) platform=efi ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=i386
+ fi ;;
+ *-64)
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ fi ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable debug mm-debug)
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use sdl && use_enable debug grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use multislot; then
+ myeconfargs+=( --program-transform-name="s,grub,grub2," )
+ fi
+
+ # Set up font symlinks
+ ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use themes; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ use static && HOST_LDFLAGS+=" -static"
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ if use multislot; then
+ mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+ fi
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+}
+
+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
+ 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
+ fi
+}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-02-16 20:39 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-02-16 20:39 UTC (permalink / raw
To: gentoo-commits
commit: d8e6cacb7143499f99fee5dfded84dc8aab1ff92
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 16 20:38:48 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb 16 20:39:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e6cacb
sys-boot/grub: RESTRICT="!test? ( test )"
Package-Manager: Portage-2.3.3_p56, Repoman-2.3.1_p49
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 4 ++--
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 2 +-
sys-boot/grub/grub-2.02_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 3bc7b41de7..88bce98d42 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -109,7 +109,7 @@ RDEPEND+="
DEPEND+=" !!=media-libs/freetype-2.5.4"
STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
QA_EXECSTACK="
usr/bin/grub*-emu*
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index bb291d118a..d9554668de 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -115,7 +115,7 @@ RDEPEND+="
DEPEND+=" !!=media-libs/freetype-2.5.4"
STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
QA_EXECSTACK="
usr/bin/grub*-emu*
diff --git a/sys-boot/grub/grub-2.02_rc1.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
index 7409bfd4ff..d2588046ba 100644
--- a/sys-boot/grub/grub-2.02_rc1.ebuild
+++ b/sys-boot/grub/grub-2.02_rc1.ebuild
@@ -114,7 +114,7 @@ RDEPEND+="
DEPEND+=" !!=media-libs/freetype-2.5.4"
-RESTRICT="strip test"
+RESTRICT="strip !test? ( test )"
QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
QA_WX_LOAD="usr/lib/grub/*"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8aeed5fc34..b56b7d2686 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -120,7 +120,7 @@ RDEPEND+="
DEPEND+=" !!=media-libs/freetype-2.5.4"
-RESTRICT="strip test"
+RESTRICT="strip !test? ( test )"
QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
QA_WX_LOAD="usr/lib/grub/*"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-02-14 23:08 Robin H. Johnson
0 siblings, 0 replies; 215+ messages in thread
From: Robin H. Johnson @ 2017-02-14 23:08 UTC (permalink / raw
To: gentoo-commits
commit: ab70393b8cadaf5f477a0df4b189a7e8e3a4c7da
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 23:07:51 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 23:08:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab70393b
sys-boot/grub: update test dependencies.
Package-Manager: portage-2.3.2
sys-boot/grub/grub-9999.ebuild | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7409bfd4ff..8aeed5fc34 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -95,8 +95,14 @@ DEPEND="${RDEPEND}
)
)
test? (
- dev-libs/libisoburn
+ 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
@@ -137,6 +143,14 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
fi
+ # Nothing in Gentoo packages 'american-english' in the exact path
+ # wanted for the test, but all that is needed is a compressible text
+ # file, and we do have 'words' from miscfiles in the same path.
+ sed -i \
+ -e '/CFILESSRC.*=/s,american-english,words,' \
+ tests/util/grub-fs-tester.in \
+ || die
+
if [[ -n ${GRUB_AUTOGEN} ]]; then
python_setup
bash autogen.sh || die
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-02-14 15:42 Robin H. Johnson
0 siblings, 0 replies; 215+ messages in thread
From: Robin H. Johnson @ 2017-02-14 15:42 UTC (permalink / raw
To: gentoo-commits
commit: e412c3342d88400b3a69dd8c9ff6c6d08f169761
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 23:51:48 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 15:42:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e412c334
sys-boot/grub: add ~arm64.
Runtime testing performed on Lenovo CaviumX thanks to Packet.net.
Package-Manager: portage-2.3.2
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
sys-boot/grub/grub-2.02_rc1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_rc1.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
index 5588e17754..7409bfd4ff 100644
--- a/sys-boot/grub/grub-2.02_rc1.ebuild
+++ b/sys-boot/grub/grub-2.02_rc1.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 5588e17754..7409bfd4ff 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-02-04 19:35 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-02-04 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 3c1de7c4ab91294d0b59f79aa73e27d5c15e301a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 19:34:51 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 19:34:51 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c1de7c4
sys-boot/grub: silence QA warning about WX sections
Bug: https://bugs.gentoo.org/607844
Package-Manager: Portage-2.3.3_p47_p599968, Repoman-2.3.1_p40_p599968
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 10cee01..bb291d1 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -125,11 +125,7 @@ QA_EXECSTACK="
usr/lib*/grub/*/kernel.img
"
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
+QA_WX_LOAD="usr/lib/grub/*"
QA_PRESTRIPPED="
usr/lib.*/grub/.*/kernel.img
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2017-02-04 19:31 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2017-02-04 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 8eb3d389d4ef62e85a50f49afaedbef4055b8a7c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 19:30:10 2017 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 19:31:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eb3d389
sys-boot/grub: bump to 2.02~rc1
Package-Manager: Portage-2.3.3_p47_p599686, Repoman-2.3.1_p40_p599686
sys-boot/grub/Manifest | 3 ++-
.../{grub-9999.ebuild => grub-2.02_rc1.ebuild} | 26 ++++++++++++++--------
sys-boot/grub/grub-9999.ebuild | 26 ++++++++++++++--------
3 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 1983a16..7b7d0b3 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -6,7 +6,8 @@ DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47
DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
+DIST grub-2.02~rc1.tar.xz 6051964 SHA256 445239e9b96d1143c194c1d37851cf4196b83701c60172e49665e9d453d80278 SHA512 c55a91f43d3c065dc9303fc9ab164910432095a571e28082cbcae646b8b92212f85da22873af99a1a5d7c943c51e2f90837dd2c68abf87ff50bf2e5955877f39 WHIRLPOOL 7ae697d8de28f1e936e49662564900ce82402895a7d3d07c70879c68ed9765ac2e82a89a8d2da4cfb6ecf64cc04c61ff4b889283a2e8abad0c38d86d889a6317
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
-DIST unifont-9.0.02.pcf.gz 1360332 SHA256 c2f2a3d6a4e8420d4ed66778ca61836225ff68d6ef031aad6842f4d02914961f SHA512 f619d6a23217d28399b1cf842077891af6749eb611b1c6e3bb9fce94a918834c6a73d423dafe9b5d36661ac7fd2c0aa4ef3c483f449fed48f4d09ae55359073b WHIRLPOOL 2323c2a3bea1eaeeb4c31d921114b9dc5f974a21f73465b7e6b2bb5e1f0b1a84767e1e638e36f6260395c9d3382d66cc631b7e75f72e7833eb168d5d07dcb363
+DIST unifont-9.0.06.pcf.gz 1360354 SHA256 6d23e82ea3fd3d79849d675c0c30129b62a3973a83b4cdc05f9994efef773b86 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774 WHIRLPOOL 3153fe2a254cffa5aac6c5915468262bf60f993ce5a2aa47885ccef2a6714e205724b01fd9d26d499b9efbc5213e3cea0037c91f17fb2ae780ee289cab0de69b
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-2.02_rc1.ebuild
similarity index 93%
copy from sys-boot/grub/grub-9999.ebuild
copy to sys-boot/grub/grub-2.02_rc1.ebuild
index 8299681..5588e17 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-2.02_rc1.ebuild
@@ -1,11 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ WANT_LIBTOOL=none
inherit autotools python-any-r1
fi
@@ -18,9 +23,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="~amd64 ~x86"
@@ -36,7 +39,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.02
+UNIFONT=unifont-9.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -134,7 +137,7 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
fi
- if [[ ${PV} == 9999 ]]; then
+ if [[ -n ${GRUB_AUTOGEN} ]]; then
python_setup
bash autogen.sh || die
autopoint() { :; }
@@ -202,7 +205,8 @@ grub_configure() {
ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
}
src_configure() {
@@ -225,8 +229,12 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC # Bug 485592
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
grub_do grub_configure
}
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 8299681..5588e17 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,11 +1,16 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
if [[ ${PV} == 9999 ]]; then
+ GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ WANT_LIBTOOL=none
inherit autotools python-any-r1
fi
@@ -18,9 +23,7 @@ if [[ ${PV} != 9999 ]]; then
SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
S=${WORKDIR}/${MY_P}
else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="~amd64 ~x86"
@@ -36,7 +39,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.02
+UNIFONT=unifont-9.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -134,7 +137,7 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
fi
- if [[ ${PV} == 9999 ]]; then
+ if [[ -n ${GRUB_AUTOGEN} ]]; then
python_setup
bash autogen.sh || die
autopoint() { :; }
@@ -202,7 +205,8 @@ grub_configure() {
ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
fi
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+ local ECONF_SOURCE="${S}"
+ econf "${myeconfargs[@]}"
}
src_configure() {
@@ -225,8 +229,12 @@ src_configure() {
tc-export CC NM OBJCOPY RANLIB STRIP
tc-export BUILD_CC # Bug 485592
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ MULTIBUILD_VARIANTS=()
+ local p
+ for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+ use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+ done
+ [[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
grub_do grub_configure
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-12-21 22:54 Thomas Deutschmann
0 siblings, 0 replies; 215+ messages in thread
From: Thomas Deutschmann @ 2016-12-21 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 0b4a3ee34085c5a8b0b1fc95e479c9c214c5b1aa
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 21:53:36 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 22:54:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4a3ee3
sys-boot/grub: x86 stable (bug #591058)
Package-Manager: Portage-2.3.2, Repoman-2.3.1
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 45fcb98..10cee01 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} != 9999 ]]; then
https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-10-04 20:58 Ian Stakenvicius
0 siblings, 0 replies; 215+ messages in thread
From: Ian Stakenvicius @ 2016-10-04 20:58 UTC (permalink / raw
To: gentoo-commits
commit: b61730e9607593593ff61f4b81b7db0aa25ab8f0
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 4 20:55:40 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Oct 4 20:58:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61730e9
sys-boot/grub:0: drop old handbook URL in favor of wiki URL
Package-Manager: portage-2.2.28
sys-boot/grub/grub-0.97-r16.ebuild | 4 ++--
sys-boot/grub/grub-0.97-r17.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild
index 761da22..96e5035 100644
--- a/sys-boot/grub/grub-0.97-r16.ebuild
+++ b/sys-boot/grub/grub-0.97-r16.ebuild
@@ -226,8 +226,8 @@ setup_boot_dir() {
ewarn "This means you must use either grub-install or perform"
ewarn "root/setup manually."
ewarn
- ewarn "For more help, see the handbook:"
- ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
+ ewarn "For more help, see the wiki:"
+ ewarn "https://wiki.gentoo.org/wiki/GRUB"
echo
fi
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
index 8aa7777..76bb769 100644
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ b/sys-boot/grub/grub-0.97-r17.ebuild
@@ -218,8 +218,8 @@ setup_boot_dir() {
ewarn "This means you must use either grub-install or perform"
ewarn "root/setup manually."
ewarn
- ewarn "For more help, see the handbook:"
- ewarn "https://www.gentoo.org/doc/en/handbook/handbook-${ARCH}.xml?part=1&chap=10#grub-install-auto"
+ ewarn "For more help, see the wiki:"
+ ewarn "https://wiki.gentoo.org/wiki/GRUB"
echo
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-09-18 21:12 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-09-18 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 47510f3ef16cd103897ce2be858c5fbdee9de001
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Mon Sep 12 21:33:00 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 21:11:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47510f3e
sys-boot/grub: Allow user patchset
Package-Manager: portage-2.2.28
sys-boot/grub/grub-0.97-r17.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
index 6e27cbe..8aa7777 100644
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ b/sys-boot/grub/grub-0.97-r17.ebuild
@@ -73,6 +73,8 @@ src_prepare() {
epatch "${FILESDIR}"/grub-0.97-Add-esp-to-list-of-clobbered-registers.patch
epatch "${FILESDIR}"/grub-0.97-ncurses-pkgconfig.patch
+ epatch_user
+
rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away
eautoreconf
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-09-10 20:02 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-09-10 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 16d9dc3fffc32be3ea38f97b05fa982ed7704a0e
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 10 18:32:23 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 20:02:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16d9dc3f
sys-boot/grub: unifont 9.0.02
Package-Manager: portage-2.3.0_p24
sys-boot/grub/Manifest | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 65225e1..1983a16 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -9,4 +9,4 @@ DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
-DIST unifont-9.0.01.pcf.gz 1360323 SHA256 9facd7efda3c960f67aff79db39912d8f1040f56e6c0e34b17dacc6b88737fd8 SHA512 23b6eac158825a02f4e1961b9277d6b1be68508c88abce60b3548f54b7cf8f9c86e26b8841fb59c650c17a5d22b3f5b401b222593fc78b0f8fe39d5ead2a6a18 WHIRLPOOL 709a0139a000b2bbe936153d6f69ba8f7b7b0be52fc202bf0224c9eebdcddacd8b568f36cec77d768c7b2cc5512aa945e3cf2c1971e32a6846139fa182e6b30d
+DIST unifont-9.0.02.pcf.gz 1360332 SHA256 c2f2a3d6a4e8420d4ed66778ca61836225ff68d6ef031aad6842f4d02914961f SHA512 f619d6a23217d28399b1cf842077891af6749eb611b1c6e3bb9fce94a918834c6a73d423dafe9b5d36661ac7fd2c0aa4ef3c483f449fed48f4d09ae55359073b WHIRLPOOL 2323c2a3bea1eaeeb4c31d921114b9dc5f974a21f73465b7e6b2bb5e1f0b1a84767e1e638e36f6260395c9d3382d66cc631b7e75f72e7833eb168d5d07dcb363
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index faa6cec..8299681 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -36,7 +36,7 @@ PATCHES=(
)
DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.01
+UNIFONT=unifont-9.0.02
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-24 18:11 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-24 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 6b6dc3200101e816b21bed0be6b795421956f9bf
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 18:11:19 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 18:11:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6dc320
sys-boot/grub: update postinst warnings for multislot
Package-Manager: portage-2.3.0_p22
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 75d6dd1..3bc7b41 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -287,7 +287,7 @@ pkg_postinst() {
if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
+ ewarn "Please run $(usex multislot grub2 grub)-install and $(usex multislot grub2 grub)-mkconfig -o /boot/grub/grub.cfg."
if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
mkdir -p "${ROOT%/}/boot/grub"
@@ -315,7 +315,7 @@ pkg_postinst() {
local v
for v in ${REPLACING_VERSIONS}; do
if ! version_is_at_least 2.02_beta2-r8 ${v}; then
- ewarn "Please re-run grub2-install to address a security flaw when using"
+ ewarn "Please re-run $(usex multislot grub2 grub)-install to address a security flaw when using"
ewarn "username/password authentication in grub."
ewarn "See bug 568326 for more information."
fi
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-18 13:00 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-18 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 4f1af4cdfe09f6e2296a30bb1f0e90ba08da1970
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 12:51:30 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 13:00:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1af4cd
sys-boot/grub: block sys-boot/grub:2[-multislot]
Bug: https://bugs.gentoo.org/591574
Package-Manager: portage-2.3.0_p16
sys-boot/grub/grub-0.97-r16.ebuild | 3 ++-
sys-boot/grub/grub-0.97-r17.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r16.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild
index 9da0d0e..761da22 100644
--- a/sys-boot/grub/grub-0.97-r16.ebuild
+++ b/sys-boot/grub/grub-0.97-r16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,6 +37,7 @@ LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)]
RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
+RDEPEND+=" !sys-boot/grub:2[-multislot]"
pkg_setup() {
case $(tc-arch) in
diff --git a/sys-boot/grub/grub-0.97-r17.ebuild b/sys-boot/grub/grub-0.97-r17.ebuild
index 790e6b2..6e27cbe 100644
--- a/sys-boot/grub/grub-0.97-r17.ebuild
+++ b/sys-boot/grub/grub-0.97-r17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -38,6 +38,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )"
DEPEND="${RDEPEND}
virtual/pkgconfig
static? ( ${LIB_DEPEND} )"
+RDEPEND+=" !sys-boot/grub:2[-multislot]"
pkg_setup() {
case $(tc-arch) in
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-18 13:00 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-18 13:00 UTC (permalink / raw
To: gentoo-commits
commit: 5768514fa55c889722d78cfc64993d31c3c67aac
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 12:48:31 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 13:00:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5768514f
sys-boot/grub: block sys-boot/grub-static when multislot is disabled
Bug: https://bugs.gentoo.org/591574
Package-Manager: portage-2.3.0_p16
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 2 +-
sys-boot/grub/grub-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 1997e45..75d6dd1 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -102,7 +102,7 @@ RDEPEND+="
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
nls? ( sys-devel/gettext )
"
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 1aecead..64dadcf 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -108,7 +108,7 @@ RDEPEND+="
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
nls? ( sys-devel/gettext )
"
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d83bd8f..faa6cec 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -105,7 +105,7 @@ RDEPEND+="
grub_platforms_efi-32? ( sys-boot/efibootmgr )
grub_platforms_efi-64? ( sys-boot/efibootmgr )
)
- !multislot? ( !sys-boot/grub:0 )
+ !multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
nls? ( sys-devel/gettext )
"
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-18 13:00 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-18 13:00 UTC (permalink / raw
To: gentoo-commits
commit: ee57fd5473354c41e8f625481258ad21806a3fdf
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 12:53:24 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 13:00:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee57fd54
sys-boot/grub: remove old
Package-Manager: portage-2.3.0_p16
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 322 --------------------------------
1 file changed, 322 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
deleted file mode 100644
index 6d73c02..0000000
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-GRUB_AUTOGEN=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r3.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 x86"
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
-
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default_src_unpack
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-
- epatch "${FILESDIR}"/CVE-2015-8370.patch
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
- eautoreconf
- fi
-}
-
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
- fi ;;
- efi-64)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
-
- local grub=grub
- if use multislot; then
- grub=grub2
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
- fi
-
- bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
-
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_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
- 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
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 2.02_beta2-r8 ${v}; then
- ewarn "Please re-run grub2-install to address a security flaw when using"
- ewarn "username/password authentication in grub."
- ewarn "See bug 568326 for more information."
- fi
- done
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-14 22:31 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-14 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 9bf703a317b055d1f719003dee91e8f493be9c70
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 14 22:30:57 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Aug 14 22:30:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf703a3
sys-boot/grub: set RESTRICT=strip
STRIP_MASK is not documented in PMS, so avoid using it.
Also further simplify QA variables.
Package-Manager: portage-2.3.0_p16
sys-boot/grub/grub-9999.ebuild | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index f6dc560..d83bd8f 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -111,13 +111,11 @@ RDEPEND+="
DEPEND+=" !!=media-libs/freetype-2.5.4"
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
+RESTRICT="strip test"
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib*/grub/*"
-QA_WX_LOAD="usr/lib*/grub/*"
-QA_MULTILIB_PATHS="usr/lib.*/grub/.*"
-QA_PRESTRIPPED="usr/lib.*/grub/.*"
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
src_unpack() {
if [[ ${PV} == 9999 ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-13 19:33 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-13 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 4bb6c7744d32be07424a49cb9977349c28ccfc2f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 19:33:05 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 19:33:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb6c774
sys-boot/grub: simplify QA variables
Package-Manager: portage-2.3.0_p16
sys-boot/grub/grub-9999.ebuild | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index e3c62b0..f6dc560 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -114,23 +114,10 @@ DEPEND+=" !!=media-libs/freetype-2.5.4"
STRIP_MASK="*/grub/*/*.{mod,img}"
RESTRICT="test"
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib*/grub/*"
+QA_WX_LOAD="usr/lib*/grub/*"
+QA_MULTILIB_PATHS="usr/lib.*/grub/.*"
+QA_PRESTRIPPED="usr/lib.*/grub/.*"
src_unpack() {
if [[ ${PV} == 9999 ]]; then
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-13 19:33 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-08-13 19:33 UTC (permalink / raw
To: gentoo-commits
commit: d229bb153942eb4f224dd7c16afadea8029ad2db
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 19:24:42 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 19:33:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d229bb15
sys-boot/grub: update fonts
Package-Manager: portage-2.3.0_p16
sys-boot/grub/Manifest | 2 ++
sys-boot/grub/{grub-9999-r1.ebuild => grub-9999.ebuild} | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a3561c1..65225e1 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,6 @@
DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
DIST dejavu-sans-ttf-2.35.zip 415463 SHA256 c629bce270e75b6234d5285a739cd186bebc27319993f4b1ea6beb3631810799 SHA512 23c24218da70b3a93fa8c72e8db972b2b881bf3f76056a9315e29162743a8edaf5b699e0a527de121ca5f9efe07243eaf15811db355dba8cca1b92bdd1210732 WHIRLPOOL e3436818e11dab0330bff1a129d1e6fbf670b06a362b353f7bd00388cf46790bde202f1f7dd67b03ad7f9ae7d76098a5a72bc5321f359c2138c4d42c0cebc2aa
+DIST dejavu-sans-ttf-2.37.zip 417746 SHA256 5c6e497a2f36552cb5ffb112c413a6af39c0f3c47653662b90b4fa6499822fd7 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae WHIRLPOOL 6f19280e76ea3efe265db09236e94bdd00268c5d8742c191100b8eb19faa532289fb03d838e33aa3c501d8a3243db248648af8929d5d5dba1bfd2ea2c10358cd
DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
@@ -8,3 +9,4 @@ DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
+DIST unifont-9.0.01.pcf.gz 1360323 SHA256 9facd7efda3c960f67aff79db39912d8f1040f56e6c0e34b17dacc6b88737fd8 SHA512 23b6eac158825a02f4e1961b9277d6b1be68508c88abce60b3548f54b7cf8f9c86e26b8841fb59c650c17a5d22b3f5b401b222593fc78b0f8fe39d5ead2a6a18 WHIRLPOOL 709a0139a000b2bbe936153d6f69ba8f7b7b0be52fc202bf0224c9eebdcddacd8b568f36cec77d768c7b2cc5512aa945e3cf2c1971e32a6846139fa182e6b30d
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999.ebuild
similarity index 99%
rename from sys-boot/grub/grub-9999-r1.ebuild
rename to sys-boot/grub/grub-9999.ebuild
index 51e376e..e3c62b0 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -35,8 +35,8 @@ PATCHES=(
"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
)
-DEJAVU=dejavu-sans-ttf-2.35
-UNIFONT=unifont-8.0.01
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-9.0.01
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-11 14:22 William Hubbs
0 siblings, 0 replies; 215+ messages in thread
From: William Hubbs @ 2016-08-11 14:22 UTC (permalink / raw
To: gentoo-commits
commit: a8fdb603e14ac8c9d3d166767467f16e1510de8e
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 11 14:18:37 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 11 14:18:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8fdb603
sys-boot/grub: do not force multislot use flag on
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 2 +-
sys-boot/grub/grub-9999-r1.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index 3169d40..6d73c02 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 48b6fbf..1997e45 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index edef1e7..1aecead 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -49,7 +49,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 9fe3b54..51e376e 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -46,7 +46,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-10 2:45 William Hubbs
0 siblings, 0 replies; 215+ messages in thread
From: William Hubbs @ 2016-08-10 2:45 UTC (permalink / raw
To: gentoo-commits
commit: af660d70a66bd60c1256f5f29e6b67d0b30ade19
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 02:43:56 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 02:43:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af660d70
Revert "sys-boot/grub: do not force multislot use flag on"
This reverts commit bd29c07ee1edf51553ced4ff9d57076b3ce6732c.
I need to wait another day for this.
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 2 +-
sys-boot/grub/grub-9999-r1.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index 6d73c02..3169d40 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 1997e45..48b6fbf 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 1aecead..edef1e7 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -49,7 +49,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 51e376e..9fe3b54 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -46,7 +46,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-08-10 2:35 William Hubbs
0 siblings, 0 replies; 215+ messages in thread
From: William Hubbs @ 2016-08-10 2:35 UTC (permalink / raw
To: gentoo-commits
commit: bd29c07ee1edf51553ced4ff9d57076b3ce6732c
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 02:33:59 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 02:33:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd29c07e
sys-boot/grub: do not force multislot use flag on
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 2 +-
sys-boot/grub/grub-9999-r1.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index 3169d40..6d73c02 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 48b6fbf..1997e45 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index edef1e7..1aecead 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -49,7 +49,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 9fe3b54..51e376e 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -46,7 +46,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static 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 )
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-06-29 2:27 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-06-29 2:27 UTC (permalink / raw
To: gentoo-commits
commit: 0475287b1eb40bb052bb2c5e5ac5da1019e165e5
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 02:25:59 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 02:25:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0475287b
sys-boot/grub: refactor platform logic
Package-Manager: portage-2.3.0_p7
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 29 +++++++++++++----------------
sys-boot/grub/grub-9999-r1.ebuild | 29 +++++++++++++----------------
2 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index fd6f5f2..51efcb7 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -168,26 +168,23 @@ grub_configure() {
local platform
case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
+ efi*) platform=efi ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
+ local CTARGET=i386
fi ;;
- efi-64)
- platform=efi
+ *-64)
if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- xen-32)
- platform=xen
- if [[ ${CHOST} == x86_64* ]]; then
- local CTARGET=i386
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
esac
local myeconfargs=(
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index b0c7084..ad57624 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -169,26 +169,23 @@ grub_configure() {
local platform
case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
+ efi*) platform=efi ;;
+ xen*) platform=xen ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ case ${MULTIBUILD_VARIANT} in
+ *-32)
if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
+ local CTARGET=i386
fi ;;
- efi-64)
- platform=efi
+ *-64)
if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- xen-32)
- platform=xen
- if [[ ${CHOST} == x86_64* ]]; then
- local CTARGET=i386
+ local CTARGET=x86_64
+ local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
esac
local myeconfargs=(
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-06-29 2:27 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-06-29 2:27 UTC (permalink / raw
To: gentoo-commits
commit: 57c5991e03570071692d111a0f0fe36bd4946b9a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 02:26:39 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 02:26:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c5991e
Revert "sys-boot/grub: populate MULTIBUILD_VARIANTS in a more PMS-defined way"
This reverts commit e1374135af76bf31a01ff4ecb6696d8bbe041f31.
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 15 +--------------
sys-boot/grub/grub-9999-r1.ebuild | 15 +--------------
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 51efcb7..edef1e7 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -219,19 +219,6 @@ grub_configure() {
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
-grub_get_platforms() {
- MULTIBUILD_VARIANTS=()
- local platform
- for platform in "${GRUB_ALL_PLATFORMS[@]}"; do
- if use "grub_platforms_${platform}"; then
- MULTIBUILD_VARIANTS+=( "${platform}" )
- fi
- done
- if (( ${#MULTIBUILD_VARIANTS[@]} == 0 )); then
- MULTIBUILD_VARIANTS=( guessed )
- fi
-}
-
src_configure() {
# Bug 508758.
replace-flags -O3 -O2
@@ -253,7 +240,7 @@ src_configure() {
tc-export BUILD_CC # Bug 485592
# Portage will take care of cleaning up GRUB_PLATFORMS
- grub_get_platforms
+ MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
grub_do grub_configure
}
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index ad57624..9fe3b54 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -220,19 +220,6 @@ grub_configure() {
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
-grub_get_platforms() {
- MULTIBUILD_VARIANTS=()
- local platform
- for platform in "${GRUB_ALL_PLATFORMS[@]}"; do
- if use "grub_platforms_${platform}"; then
- MULTIBUILD_VARIANTS+=( "${platform}" )
- fi
- done
- if (( ${#MULTIBUILD_VARIANTS[@]} == 0 )); then
- MULTIBUILD_VARIANTS=( guessed )
- fi
-}
-
src_configure() {
# Bug 508758.
replace-flags -O3 -O2
@@ -254,7 +241,7 @@ src_configure() {
tc-export BUILD_CC # Bug 485592
# Portage will take care of cleaning up GRUB_PLATFORMS
- grub_get_platforms
+ MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
grub_do grub_configure
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-04-27 17:53 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-04-27 17:53 UTC (permalink / raw
To: gentoo-commits
commit: e1374135af76bf31a01ff4ecb6696d8bbe041f31
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 17:53:01 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 17:53:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1374135
sys-boot/grub: populate MULTIBUILD_VARIANTS in a more PMS-defined way
Package-Manager: portage-2.2.28_p79
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 15 ++++++++++++++-
sys-boot/grub/grub-9999-r1.ebuild | 15 ++++++++++++++-
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 99531f1..ab05794 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -215,6 +215,19 @@ grub_configure() {
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
+grub_get_platforms() {
+ MULTIBUILD_VARIANTS=()
+ local platform
+ for platform in "${GRUB_ALL_PLATFORMS[@]}"; do
+ if use "grub_platforms_${platform}"; then
+ MULTIBUILD_VARIANTS+=( "${platform}" )
+ fi
+ done
+ if (( ${#MULTIBUILD_VARIANTS[@]} == 0 )); then
+ MULTIBUILD_VARIANTS=( guessed )
+ fi
+}
+
src_configure() {
# Bug 508758.
replace-flags -O3 -O2
@@ -236,7 +249,7 @@ src_configure() {
tc-export BUILD_CC # Bug 485592
# Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ grub_get_platforms
grub_do grub_configure
}
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 350857b..c880d12 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -217,6 +217,19 @@ grub_configure() {
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
+grub_get_platforms() {
+ MULTIBUILD_VARIANTS=()
+ local platform
+ for platform in "${GRUB_ALL_PLATFORMS[@]}"; do
+ if use "grub_platforms_${platform}"; then
+ MULTIBUILD_VARIANTS+=( "${platform}" )
+ fi
+ done
+ if (( ${#MULTIBUILD_VARIANTS[@]} == 0 )); then
+ MULTIBUILD_VARIANTS=( guessed )
+ fi
+}
+
src_configure() {
# Bug 508758.
replace-flags -O3 -O2
@@ -238,7 +251,7 @@ src_configure() {
tc-export BUILD_CC # Bug 485592
# Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ grub_get_platforms
grub_do grub_configure
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-04-27 16:20 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-04-27 16:20 UTC (permalink / raw
To: gentoo-commits
commit: c9f9131f78246af7b45d0375606ae6c616765a75
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 16:20:25 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 16:20:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f9131f
sys-boot/grub: call eautoreconf for the sysmacros patch
Package-Manager: portage-2.2.28_p79
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
index 43291a0..99531f1 100644
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
if [[ ${PV} == 9999 ]]; then
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
- inherit autotools python-any-r1
+ inherit python-any-r1
fi
inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
@@ -150,12 +150,8 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
fi
- if [[ ${PV} == 9999 ]]; then
- python_setup
- bash autogen.sh || die
- autopoint() { :; }
- eautoreconf
- fi
+ autopoint() { :; }
+ eautoreconf
}
grub_do() {
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-04-18 9:43 Patrice Clement
0 siblings, 0 replies; 215+ messages in thread
From: Patrice Clement @ 2016-04-18 9:43 UTC (permalink / raw
To: gentoo-commits
commit: f7c9162ccdae8718ee3a744a718d89e197e75c31
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 09:24:38 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 09:29:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7c9162c
sys-boot/grub: Fix metadata.xml file.
Package-Manager: portage-2.2.26
sys-boot/grub/metadata.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 3696f72..8dc732a 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -23,8 +23,8 @@
Enable support for <pkg>sys-fs/zfs</pkg>
</flag>
<flag name="multislot">
- Allow concurrent installation of <pkg>sys-boot/grub:0</pkg> and
- <pkg>sys-boot/grub:2</pkg> by renaming all programs.
+ Allow concurrent installation of <pkg>sys-boot/grub</pkg> SLOT 0 and
+ <pkg>sys-boot/grub</pkg> SLOT 2 by renaming all programs.
</flag>
<flag name="themes">Build and install GRUB themes (starfield)</flag>
<flag name="truetype">Build and install grub-mkfont conversion utility</flag>
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-03-05 22:53 Mikle Kolyada
0 siblings, 0 replies; 215+ messages in thread
From: Mikle Kolyada @ 2016-03-05 22:53 UTC (permalink / raw
To: gentoo-commits
commit: ca39992301e0a7d9bf26d8022623b998d313a651
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 22:50:13 2016 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 22:50:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca399923
sys-boot/grub: x86 stable wrt bug #575596
Package-Manager: portage-2.2.26
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 239306a..48b6fbf 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-03-05 16:08 Mikle Kolyada
0 siblings, 0 replies; 215+ messages in thread
From: Mikle Kolyada @ 2016-03-05 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 9e124bdb4d73036a73bfa8ab583c657b7a116e9f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 16:05:49 2016 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 16:05:49 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e124bdb
sys-boot/grub: amd64 stable wrt bug #575596
Package-Manager: portage-2.2.26
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index ed8e047..239306a 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-03-04 22:12 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-03-04 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 13f15068ad3b0125327953f117fa484e74d841d7
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 21:41:02 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 22:12:22 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f15068
sys-boot/grub: Update the live ebuild
Move to EAPI 6 and various other cleanups.
Package-Manager: portage-2.2.27_p64
sys-boot/grub/grub-9999-r1.ebuild | 87 ++++++++++++++-------------------------
1 file changed, 32 insertions(+), 55 deletions(-)
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 149153a..9941709 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,20 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-if [[ ${PV} == 9999 ]]; then
- AUTOTOOLS_AUTORECONF=1
- GRUB_AUTOGEN=1
+if [[ ${PV} == 9999 ]]; then
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ inherit autotools python-any-r1
fi
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -29,13 +24,14 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="~amd64 ~x86"
- PATCHES=()
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
http://git.savannah.gnu.org/r/grub.git"
fi
+PATCHES=( "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch )
+
DEJAVU=dejavu-sans-ttf-2.34
UNIFONT=unifont-7.0.06
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
@@ -46,7 +42,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2"
+SLOT="2/${PVR}"
IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
@@ -136,11 +132,11 @@ src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
fi
- default_src_unpack
+ default
}
src_prepare() {
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+ default
sed -i -e /autoreconf/d autogen.sh || die
@@ -149,24 +145,20 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
fi
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
+ if [[ ${PV} == 9999 ]]; then
python_setup
bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
+ autopoint() { :; }
eautoreconf
fi
}
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
}
grub_configure() {
@@ -196,7 +188,6 @@ grub_configure() {
--libdir="${EPREFIX}"/usr/lib
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
$(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
$(use_enable device-mapper)
$(use_enable mount grub-mount)
$(use_enable nls)
@@ -214,10 +205,13 @@ grub_configure() {
myeconfargs+=( --program-transform-name="s,grub,grub2," )
fi
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
+ # Set up font symlinks
+ ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use themes; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
- autotools-utils_src_configure
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
src_configure() {
@@ -242,31 +236,28 @@ src_configure() {
# Portage will take care of cleaning up GRUB_PLATFORMS
MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
+ grub_do grub_configure
}
src_compile() {
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
}
src_test() {
# The qemu dependency is a bit complex.
# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
+ grub_do emake check
}
src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
+ einstalldocs
if use multislot; then
mv "${ED%/}"/usr/share/info/grub{,2}.info || die
@@ -277,20 +268,6 @@ src_install() {
}
pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_pkg_postinst
-
elog "For information on how to configure GRUB2 please refer to the guide:"
elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2016-02-25 3:04 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2016-02-25 3:04 UTC (permalink / raw
To: gentoo-commits
commit: 509202eb2bb13f4490e0083a9b4abe2cb0398e3f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 03:04:04 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 03:04:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509202eb
sys-boot/grub: Set subslot to PVR
This change allows packages to rebuild themselves whenever grub is upgraded.
Bug: https://bugs.gentoo.org/575334
Package-Manager: portage-2.2.27_p64
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 4 ++--
sys-boot/grub/grub-2.02_beta2-r9.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index 90e0399..3169d40 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -43,7 +43,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2"
+SLOT="2/${PVR}"
IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index 4c43465..ed8e047 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -43,7 +43,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2"
+SLOT="2/${PVR}"
IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-18 16:55 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2015-12-18 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 293b4ac4d038f4c00cc19a92af728a0fa06edfa2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 16:54:42 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 16:54:59 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=293b4ac4
sys-boot/grub: Add postinst warning about security bug
Package-Manager: portage-2.2.26_p32
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index abfeffb..90e0399 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -309,5 +309,14 @@ pkg_postinst() {
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
+ else
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 2.02_beta2-r8 ${v}; then
+ ewarn "Please re-run grub2-install to address a security flaw when using"
+ ewarn "username/password authentication in grub."
+ ewarn "See bug 568326 for more information."
+ fi
+ done
fi
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-17 15:30 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2015-12-17 15:30 UTC (permalink / raw
To: gentoo-commits
commit: 502e797619d943c2f41784c0edbb0b7d14f2b8b1
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 15:30:18 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 15:30:18 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502e7976
sys-boot/grub: Remove old
Package-Manager: portage-2.2.26_p32
sys-boot/grub/grub-2.02_beta2-r7.ebuild | 314 --------------------------------
1 file changed, 314 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
deleted file mode 100644
index 8231ff6..0000000
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-GRUB_AUTOGEN=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r3.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 x86"
- PATCHES=()
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.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 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2"
-IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
- grub_platforms_coreboot? ( fonts )
- grub_platforms_qemu? ( fonts )
- grub_platforms_ieee1275? ( fonts )
- grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5:0=
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- themes? (
- app-arch/unzip
- media-libs/freetype:2
- )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
-
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default_src_unpack
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
- eautoreconf
- fi
-}
-
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
- fi ;;
- efi-64)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable themes grub-themes)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY RANLIB STRIP
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
-
- local grub=grub
- if use multislot; then
- grub=grub2
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
- fi
-
- bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
-
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_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
- 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
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-17 13:48 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2015-12-17 13:48 UTC (permalink / raw
To: gentoo-commits
commit: ee8bae0a40ef9f7516162962c42e67aa6a04b2dc
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:48:40 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:48:40 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8bae0a
sys-boot/grub: x86 stable wrt bug #568326
Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index 26bfad2..abfeffb 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-17 13:48 Agostino Sarubbo
0 siblings, 0 replies; 215+ messages in thread
From: Agostino Sarubbo @ 2015-12-17 13:48 UTC (permalink / raw
To: gentoo-commits
commit: 56b8309237841fe2334b7be262fd8677c4b052e4
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 13:48:14 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 13:48:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b83092
sys-boot/grub: amd64 stable wrt bug #568326
Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
sys-boot/grub/grub-2.02_beta2-r8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r8.ebuild b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
index c617cab..26bfad2 100644
--- a/sys-boot/grub/grub-2.02_beta2-r8.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r8.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-12 17:38 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2015-12-12 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 3eee78218218deee6daef8bcc138f919eed8bdde
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 17:37:57 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 17:37:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eee7821
sys-boot/grub: Add slot for ncurses dep
Package-Manager: portage-2.2.26_p26
sys-boot/grub/grub-2.02_beta2-r7.ebuild | 2 +-
sys-boot/grub/grub-9999-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
index 7c320db..8231ff6 100644
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
@@ -61,7 +61,7 @@ REQUIRED_USE="
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5
+ >=sys-libs/ncurses-5.2-r5:0=
debug? (
sdl? ( media-libs/libsdl )
)
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 7817857..149153a 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -63,7 +63,7 @@ REQUIRED_USE="
# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
RDEPEND="
app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5
+ >=sys-libs/ncurses-5.2-r5:0=
debug? (
sdl? ( media-libs/libsdl )
)
^ permalink raw reply related [flat|nested] 215+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-12 17:38 Mike Gilbert
0 siblings, 0 replies; 215+ messages in thread
From: Mike Gilbert @ 2015-12-12 17:38 UTC (permalink / raw
To: gentoo-commits
commit: 4b923f3999119b649ebbb711c88c52bd8aa9f404
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 17:36:14 2015 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 17:36:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b923f39
sys-boot/grub: Remove old
Package-Manager: portage-2.2.26_p26
sys-boot/grub/Manifest | 5 -
sys-boot/grub/grub-2.00_p5107-r2.ebuild | 306 ------------------------------
sys-boot/grub/grub-2.02_beta2-r3.ebuild | 313 -------------------------------
sys-boot/grub/grub-2.02_beta2-r6.ebuild | 319 --------------------------------
4 files changed, 943 deletions(-)
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ae37332..ae1a4a2 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,12 +1,7 @@
DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
-DIST grub-2.00_p5107.tar.xz 5836972 SHA256 92fd8f93621e7083f32ba6ef407f2984e5d3caaafdc35fb3d89ed054ca7c4dac SHA512 a70017dfc837e8fa869af7f71ca6191973f3f44f5a93378100cff5da425aa132b3903a3602ab907ef070872bb7a17f0586c8415845645c596d0621a4929ca83d WHIRLPOOL 5d88806fc849d2ff78ca590312110be4505e2801fee7c68faba39a54a44eedc16eb25dad88f1ff0058dea2e98382944c7e7632ccfa6f4a171ff0ef00cf67fd2d
-DIST grub-2.02_beta2-gentoo-r1.tar.xz 8048 SHA256 9a69edb0d64024b785a7f1bca58269b11e1be40f13ff2a96247249594bdb47d2 SHA512 c2ddaa188e7a2747e2256d0bb1e7c42427d5733cced3ff4b334be0671da8fab8d370861cdfee0319b4a29903a247375cf2e2a56955cc38e94a303bac5a93d974 WHIRLPOOL 0d923ed97921e145857580f7cff1f63278a4a95563d6e346b3680581991f9c7ad6d9b9965d40e407448392ee37b8c7862068281ac8f66b2a71856e1035f28eda
DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
-DIST grub-2.02_beta2-gentoo.tar.xz 6916 SHA256 63453b35faa6e02cc6e3067160158a591ed8d1e417fc2d1fce25556b28f76e03 SHA512 edc37adae1a4c9bad4bb29f335379e1e2b0a25ba7ef2768689fe0dfc236ea7057d80699659fd5facda431df957073827eba1cd83dd0204e81f068570de3722a7 WHIRLPOOL b463cb3f4a714b20845d3dbd493a0d3408a47a1fe140ca3a4dffa77052f9bfcf25046de7881e516022aa970c48701a1278cd8b598e8e1ce03a28347fbd68dab0
DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
-DIST unifont-5.1.20080820.pcf.gz 1379965 SHA256 122b9c470f29b70223b0e07404a6dfa7f339fcfa6ae74c024f478945af7a9a63 SHA512 8939e2bc82ca97b60e6678f3ff079a2be7ba9b702f2e8ee289e853af5823695f7baafbf14b674fc5e41071f2a6de4f2dadd56bf8b4653849dd756d59622f1649 WHIRLPOOL 0f083d66781cc4c3e554ebeda4e21843fa275ecf3e1908b4873fadfe37b7c88e8346a124656704bb1b29f89afee23d6301b4df0f19e788f454c60d47156fe78d
-DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528bb8ed179a749f7ca2b86eb15805 SHA512 f985e11729d18cb16d3e46fd1004242aa731a9b03ba16035f5954076686e8cdc39df9087daded5e044ead995b03650d8cf1bba9d060d65b5c3af630dbc9e3260 WHIRLPOOL da682398a22abd4282674d9a79b8fdd53e03054863cc166e43e2640dfb7f11c0b71cd3e42431f2086692f3a4202c2ecae9d6d7126249db0127e2da276aae7c9f
DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
diff --git a/sys-boot/grub/grub-2.00_p5107-r2.ebuild b/sys-boot/grub/grub-2.00_p5107-r2.ebuild
deleted file mode 100644
index 73e8c11..0000000
--- a/sys-boot/grub/grub-2.00_p5107-r2.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == 9999 ]]; then
- AUTOTOOLS_AUTORECONF=1
- GRUB_AUTOGEN=1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 x86"
- PATCHES=(
- "${FILESDIR}/grub-2.00-freetype-2.5.1.patch"
- )
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-5.1.20080820.pcf
-SRC_URI+=" truetype? (
- mirror://sourceforge/dejavu/${DEJAVU}.zip
- http://unifoundry.com/${UNIFONT}.gz
-)"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/"
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )"
-SLOT="2"
-IUSE="custom-cflags debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs"
-
-GRUB_ALL_PLATFORMS=(
- # everywhere:
- emu
- # mips only:
- qemu-mips yeeloong
- # amd64, x86, ppc, ppc64:
- ieee1275
- # amd64, x86:
- coreboot multiboot efi-32 pc qemu
- # amd64, ia64:
- efi-64
-)
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="grub_platforms_qemu? ( truetype )
- grub_platforms_yeeloong? ( truetype )"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- app-misc/pax-utils
- >=dev-lang/python-2.5.2
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- truetype? ( app-arch/unzip )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 )
- nls? ( sys-devel/gettext )
-"
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- DEPEND+=" >=sys-devel/autogen-5.10"
-fi
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
-
-QA_EXECSTACK="
- usr/bin/grub*
- usr/sbin/grub*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default_src_unpack
-}
-
-src_prepare() {
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
- sed -i -e /autoreconf/d autogen.sh || die
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
- epatch_user
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- bash autogen.sh || die
- fi
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
- eautoreconf
- fi
-}
-
-setup_fonts() {
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- ln -s "${WORKDIR}/${UNIFONT}" unifont.pcf || die
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
- fi ;;
- efi-64)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- if use truetype; then
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
- fi
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- use custom-cflags || unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
- use static && export HOST_LDFLAGS="${HOST_LDFLAGS} -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS+=" ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY STRIP
- export TARGET_CC=${TARGET_CC:-${CC}}
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
-
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-2 grub
-
- cd "${ED}" || die
- pax-mark mpes $(scanelf -BF %F usr/{bin,sbin})
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" && ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
-
- mount-boot_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 ! has_version sys-boot/os-prober; then
- elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
- fi
- if ! has_version dev-libs/libisoburn; then
- elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
- fi
- else
- local v
- for v in ${REPLACING_VERSIONS}; do
- if use multislot && ! version_is_at_least 2.00_p5107-r1 ${v}; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
- break
- fi
- done
- fi
-}
diff --git a/sys-boot/grub/grub-2.02_beta2-r3.ebuild b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
deleted file mode 100644
index 63fe13a..0000000
--- a/sys-boot/grub/grub-2.02_beta2-r3.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-GRUB_AUTOGEN=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}-gentoo.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="amd64 x86"
- PATCHES=()
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.0.01
-SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
- truetype? ( 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 truetype? ( BitstreamVera GPL-2-with-font-exception )"
-SLOT="2"
-IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs"
-
-GRUB_ALL_PLATFORMS=(
- # everywhere:
- emu
- # mips only:
- qemu-mips loongson
- # amd64, x86, ppc, ppc64:
- ieee1275
- # amd64, x86:
- coreboot multiboot efi-32 pc qemu xen
- # amd64, ia64:
- efi-64
-)
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- grub_platforms_coreboot? ( media-libs/freetype:2 )
- grub_platforms_qemu? ( media-libs/freetype:2 )
- grub_platforms_ieee1275? ( media-libs/freetype:2 )
- grub_platforms_loongson? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- truetype? ( app-arch/unzip )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
-
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default_src_unpack
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
- eautoreconf
- fi
-}
-
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use truetype; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
- fi ;;
- efi-64)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS+=" ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY STRIP
- export TARGET_CC=${TARGET_CC:-${CC}}
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
-
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
-
- if use multislot; then
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- fi
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_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
- 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
- fi
-}
diff --git a/sys-boot/grub/grub-2.02_beta2-r6.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
deleted file mode 100644
index 6ff525d..0000000
--- a/sys-boot/grub/grub-2.02_beta2-r6.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-GRUB_AUTOGEN=1
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
- if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
- # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
- MY_P=${P/_/'~'}
- SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}-gentoo-r1.tar.xz"
- S=${WORKDIR}/${MY_P}
- else
- SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
- S=${WORKDIR}/${P%_*}
- fi
- KEYWORDS="~amd64 ~x86"
- PATCHES=()
-else
- inherit git-r3
- EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
- http://git.savannah.gnu.org/r/grub.git"
-fi
-
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.0.01
-SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
- truetype? ( 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 truetype? ( BitstreamVera GPL-2-with-font-exception )"
-SLOT="2"
-IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test truetype libzfs"
-
-GRUB_ALL_PLATFORMS=(
- # everywhere:
- emu
- # mips only:
- qemu-mips loongson
- # amd64, x86, ppc, ppc64:
- ieee1275
- # amd64, x86:
- coreboot multiboot efi-32 pc qemu xen
- # amd64, ia64:
- efi-64
-)
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
- app-arch/xz-utils
- >=sys-libs/ncurses-5.2-r5
- debug? (
- sdl? ( media-libs/libsdl )
- )
- device-mapper? ( >=sys-fs/lvm2-2.02.45 )
- libzfs? ( sys-fs/zfs )
- mount? ( sys-fs/fuse )
- truetype? ( media-libs/freetype:2= )
- ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
- ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-misc/pax-utils
- sys-devel/flex
- sys-devel/bison
- sys-apps/help2man
- sys-apps/texinfo
- grub_platforms_coreboot? ( media-libs/freetype:2 )
- grub_platforms_qemu? ( media-libs/freetype:2 )
- grub_platforms_ieee1275? ( media-libs/freetype:2 )
- grub_platforms_loongson? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools:= )
- static? (
- app-arch/xz-utils[static-libs(+)]
- truetype? (
- app-arch/bzip2[static-libs(+)]
- media-libs/freetype[static-libs(+)]
- sys-libs/zlib[static-libs(+)]
- )
- )
- test? (
- dev-libs/libisoburn
- app-emulation/qemu
- )
- truetype? ( app-arch/unzip )
-"
-RDEPEND+="
- kernel_linux? (
- grub_platforms_efi-32? ( sys-boot/efibootmgr )
- grub_platforms_efi-64? ( sys-boot/efibootmgr )
- )
- !multislot? ( !sys-boot/grub:0 )
- nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-STRIP_MASK="*/grub/*/*.{mod,img}"
-RESTRICT="test"
-
-QA_EXECSTACK="
- usr/bin/grub*-emu*
- usr/lib*/grub/*/*.mod
- usr/lib*/grub/*/*.module
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
-"
-
-QA_WX_LOAD="
- usr/lib*/grub/*/kernel.exec
- usr/lib*/grub/*/kernel.img
- usr/lib*/grub/*/*.image
-"
-
-QA_PRESTRIPPED="
- usr/lib.*/grub/.*/kernel.img
-"
-
-src_unpack() {
- if [[ ${PV} == 9999 ]]; then
- git-r3_src_unpack
- fi
- default_src_unpack
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
- sed -i -e /autoreconf/d autogen.sh || die
-
- if use multislot; then
- # fix texinfo file name, bug 416035
- sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
- fi
-
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
- python_setup
- bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
- eautoreconf
- fi
-}
-
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use truetype; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
-}
-
-grub_configure() {
- local platform
-
- case ${MULTIBUILD_VARIANT} in
- efi-32)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
- local CTARGET=${CTARGET:-i386}
- fi ;;
- efi-64)
- platform=efi
- if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
- local CTARGET=${CTARGET:-x86_64}
- local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
- local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
- export TARGET_CFLAGS TARGET_CPPFLAGS
- fi ;;
- guessed) ;;
- *) platform=${MULTIBUILD_VARIANT} ;;
- esac
-
- local myeconfargs=(
- --disable-werror
- --program-prefix=
- --libdir="${EPREFIX}"/usr/lib
- --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
- $(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
- $(use_enable device-mapper)
- $(use_enable mount grub-mount)
- $(use_enable nls)
- $(use_enable truetype grub-mkfont)
- $(use_enable libzfs)
- $(use sdl && use_enable debug grub-emu-sdl)
- ${platform:+--with-platform=}${platform}
-
- # Let configure detect this where supported
- $(usex efiemu '' '--disable-efiemu')
- )
-
- if use multislot; then
- myeconfargs+=( --program-transform-name="s,grub,grub2," )
- fi
-
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
-
- autotools-utils_src_configure
-}
-
-src_configure() {
- # Bug 508758.
- replace-flags -O3 -O2
-
- # We don't want to leak flags onto boot code.
- export HOST_CCASFLAGS=${CCASFLAGS}
- export HOST_CFLAGS=${CFLAGS}
- export HOST_CPPFLAGS=${CPPFLAGS}
- export HOST_LDFLAGS=${LDFLAGS}
- unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
- use static && HOST_LDFLAGS+=" -static"
-
- tc-ld-disable-gold #439082 #466536 #526348
- export TARGET_LDFLAGS+=" ${LDFLAGS}"
- unset LDFLAGS
-
- tc-export CC NM OBJCOPY STRIP
- export TARGET_CC=${TARGET_CC:-${CC}}
- tc-export BUILD_CC # Bug 485592
-
- # Portage will take care of cleaning up GRUB_PLATFORMS
- MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
-}
-
-src_compile() {
- # Sandbox bug 404013.
- use libzfs && addpredict /etc/dfs:/dev/zfs
-
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
-}
-
-src_test() {
- # The qemu dependency is a bit complex.
- # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
-}
-
-src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
-
- local grub=grub
- if use multislot; then
- grub=grub2
- mv "${ED%/}"/usr/share/info/grub{,2}.info || die
- mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
- fi
-
- bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
-
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
-
- insinto /etc/default
- newins "${FILESDIR}"/grub.default-3 grub
-}
-
-pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_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 ! has_version sys-boot/os-prober; then
- elog "Install sys-boot/os-prober to enable detection of other operating systems using grub2-mkconfig."
- fi
- if ! has_version dev-libs/libisoburn; then
- elog "Install dev-libs/libisoburn to enable creation of rescue media using grub2-mkrescue."
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-08 21:24 Ian Stakenvicius
0 siblings, 0 replies; 215+ messages in thread
From: Ian Stakenvicius @ 2015-12-08 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 69273f1d085c5d44071c1f209e9048faa7c78202
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 21:23:20 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 21:23:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69273f1d
sys-boot/grub:0 - Force -O0 to work around bugs 564890, 566638
Package-Manager: portage-2.2.24
.../grub/{grub-0.97-r15.ebuild => grub-0.97-r16.ebuild} | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/sys-boot/grub/grub-0.97-r15.ebuild b/sys-boot/grub/grub-0.97-r16.ebuild
similarity index 93%
rename from sys-boot/grub/grub-0.97-r15.ebuild
rename to sys-boot/grub/grub-0.97-r16.ebuild
index 068f68b..9da0d0e 100644
--- a/sys-boot/grub/grub-0.97-r15.ebuild
+++ b/sys-boot/grub/grub-0.97-r16.ebuild
@@ -67,6 +67,21 @@ src_prepare() {
|| die
EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
+
+ # Work around issue where the default CFLAGS fail with gcc-4.9.3 (possibly newer), force -O0 instead
+ # bug 564890, 566638
+ if [[ $(gcc-major-version) -ge 5 || $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 9 ]]; then
+ if use custom-cflags; then
+ ewarn "You are using custom cflags with gcc-4.9 or newer."
+ ewarn "Be aware the result may segfault at runtime due to unknown optimization"
+ ewarn "incompatibilities."
+ else
+ einfo "Forcing -O0 to get around optimization issue caused by gcc-4.9 and newer with -O2"
+ sed -i -e "/CFLAGS/s/-O2/-O0/" \
+ "${S}"/configure.ac || die
+ fi
+ fi
+
rm -f "${S}"/aclocal.m4 # seems to keep bug 418287 away
eautoreconf
}
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-08 20:14 Ian Stakenvicius
0 siblings, 0 replies; 215+ messages in thread
From: Ian Stakenvicius @ 2015-12-08 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 5cb0eb89b96126bb7d364b3fc85d7f9fa20e9264
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 20:13:56 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 20:13:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb0eb89
sys-boot/grub:0 - add missing slot-operator dep on ncurses when USE="-static"
Package-Manager: portage-2.2.24
sys-boot/grub/grub-0.97-r15.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-boot/grub/grub-0.97-r15.ebuild b/sys-boot/grub/grub-0.97-r15.ebuild
index b043b06..068f68b 100644
--- a/sys-boot/grub/grub-0.97-r15.ebuild
+++ b/sys-boot/grub/grub-0.97-r15.ebuild
@@ -34,7 +34,7 @@ KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="custom-cflags ncurses netboot static"
LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//static-libs(+),/} )"
+RDEPEND="!static? ( ${LIB_DEPEND//[static-libs(+),/=[} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-08 20:00 Ian Stakenvicius
0 siblings, 0 replies; 215+ messages in thread
From: Ian Stakenvicius @ 2015-12-08 20:00 UTC (permalink / raw
To: gentoo-commits
commit: 852c5ec76e95e6751ed7c7ea4ad9ed8c704ae3c1
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 19:44:58 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 19:44:58 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852c5ec7
sys-boot/grub:0 - migrate to EAPI5 and add missing slot dep on ncurses atom
Package-Manager: portage-2.2.24
sys-boot/grub/{grub-0.97-r14.ebuild => grub-0.97-r15.ebuild} | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/sys-boot/grub/grub-0.97-r14.ebuild b/sys-boot/grub/grub-0.97-r15.ebuild
similarity index 97%
rename from sys-boot/grub/grub-0.97-r14.ebuild
rename to sys-boot/grub/grub-0.97-r15.ebuild
index f651626..b043b06 100644
--- a/sys-boot/grub/grub-0.97-r14.ebuild
+++ b/sys-boot/grub/grub-0.97-r15.ebuild
@@ -16,7 +16,7 @@
# qtbz2 -s -j ${PKGDIR}/${CAT}/${PF}.tbz2 && \
# mv ${PF}.tar.bz2 ${DISTDIR}/grub-static-${PVR}.tar.bz2
-EAPI="4"
+EAPI="5"
inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
@@ -33,11 +33,8 @@ SLOT="0"
KEYWORDS="amd64 x86 ~x86-fbsd"
IUSE="custom-cflags ncurses netboot static"
-LIB_DEPEND="ncurses? (
- >=sys-libs/ncurses-5.9-r3[static-libs(+)]
- amd64? ( >=sys-libs/ncurses-5.9-r3[abi_x86_32(-)] )
- )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)\]/} )"
+LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//static-libs(+),/} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
^ permalink raw reply related [flat|nested] 215+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
@ 2015-12-08 17:30 Doug Goldstein
0 siblings, 0 replies; 215+ messages in thread
From: Doug Goldstein @ 2015-12-08 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 775cd28bfd6e495103d3be882f8246581d1e642a
Author: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 8 17:28:48 2015 +0000
Commit: Doug Goldstein <cardoe <AT> gentoo <DOT> org>
CommitDate: Tue Dec 8 17:29:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=775cd28b
sys-boot/grub: use xen-tools sub-slot
When xen-tools changes its sub-slot, its ABI changes so we need to
rebuilt against it.
Signed-off-by: Doug Goldstein <cardoe <AT> gentoo.org>
sys-boot/grub/grub-2.02_beta2-r3.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta2-r6.ebuild | 2 +-
sys-boot/grub/grub-2.02_beta2-r7.ebuild | 2 +-
sys-boot/grub/grub-9999-r1.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-boot/grub/grub-2.02_beta2-r3.ebuild b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
index a43dd0b..63fe13a 100644
--- a/sys-boot/grub/grub-2.02_beta2-r3.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r3.ebuild
@@ -87,7 +87,7 @@ DEPEND="${RDEPEND}
grub_platforms_qemu? ( media-libs/freetype:2 )
grub_platforms_ieee1275? ( media-libs/freetype:2 )
grub_platforms_loongson? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
diff --git a/sys-boot/grub/grub-2.02_beta2-r6.ebuild b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
index 57daa39..6ff525d 100644
--- a/sys-boot/grub/grub-2.02_beta2-r6.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r6.ebuild
@@ -87,7 +87,7 @@ DEPEND="${RDEPEND}
grub_platforms_qemu? ( media-libs/freetype:2 )
grub_platforms_ieee1275? ( media-libs/freetype:2 )
grub_platforms_loongson? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
index ed6aa18..7c320db 100644
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
sys-apps/help2man
sys-apps/texinfo
fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 628843d..7817857 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -82,7 +82,7 @@ DEPEND="${RDEPEND}
sys-apps/help2man
sys-apps/texinfo
fonts? ( media-libs/freetype:2 )
- grub_platforms_xen? ( app-emulation/xen-tools )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
static? (
app-arch/xz-utils[static-libs(+)]
truetype? (
^ permalink raw reply related [flat|nested] 215+ messages in thread
end of thread, other threads:[~2024-09-21 13:11 UTC | newest]
Thread overview: 215+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-30 10:56 [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ Agostino Sarubbo
-- strict thread matches above, loose matches on Subject: below --
2024-09-21 13:11 Arthur Zamarin
2024-09-21 13:11 Arthur Zamarin
2024-09-13 19:33 Arthur Zamarin
2024-09-12 19:34 Sam James
2024-09-12 19:34 Sam James
2024-09-12 18:26 Mike Gilbert
2024-09-11 14:54 Mike Gilbert
2024-09-05 15:34 James Le Cuirot
2024-08-07 19:21 Andrew Ammerlaan
2024-08-04 15:28 Mike Gilbert
2024-04-30 18:46 Mike Gilbert
2024-04-13 14:52 Mike Gilbert
2024-04-04 20:35 Mike Gilbert
2024-04-04 20:35 Mike Gilbert
2024-04-04 20:31 Mike Gilbert
2024-04-04 20:31 Mike Gilbert
2024-03-27 18:53 Arthur Zamarin
2024-03-27 18:52 Arthur Zamarin
2024-03-13 0:54 Sam James
2024-03-02 11:04 Arthur Zamarin
2024-03-02 10:57 Arthur Zamarin
2024-02-15 23:51 Sam James
2024-02-06 22:32 Sam James
2024-02-04 3:20 Mike Gilbert
2024-02-02 6:28 Andrew Ammerlaan
2024-01-16 17:42 Mike Gilbert
2024-01-16 17:42 Mike Gilbert
2024-01-16 17:42 Mike Gilbert
2023-12-26 21:39 Sam James
2023-12-26 21:26 Sam James
2023-12-24 11:59 Ulrich Müller
2023-12-23 1:00 Zac Medico
2023-12-12 6:30 Viorel Munteanu
2023-12-11 16:37 WANG Xuerui
2023-10-05 4:47 Arthur Zamarin
2023-10-05 4:47 Arthur Zamarin
2023-10-04 19:27 Mike Gilbert
2023-07-31 16:42 Mike Gilbert
2023-07-31 16:42 Mike Gilbert
2023-07-11 1:07 Mike Gilbert
2023-07-11 1:07 Mike Gilbert
2023-07-10 1:42 Mike Gilbert
2023-05-09 20:23 Mike Gilbert
2023-04-22 15:15 Arthur Zamarin
2023-04-22 15:15 Arthur Zamarin
2023-04-22 15:15 Arthur Zamarin
2023-04-22 15:15 Arthur Zamarin
2023-04-22 15:15 Arthur Zamarin
2023-04-22 15:15 Arthur Zamarin
2023-04-05 3:50 Arthur Zamarin
2023-01-17 16:03 Mike Gilbert
2023-01-01 3:11 Sam James
2022-12-20 18:13 Mike Gilbert
2022-12-20 18:13 Mike Gilbert
2022-12-02 7:32 Arthur Zamarin
2022-11-19 10:16 Arthur Zamarin
2022-11-19 10:16 Arthur Zamarin
2022-11-19 10:16 Arthur Zamarin
2022-11-19 10:16 Arthur Zamarin
2022-11-19 10:16 Arthur Zamarin
2022-11-19 10:16 Arthur Zamarin
2022-11-16 0:43 Mike Gilbert
2022-11-16 0:43 Mike Gilbert
2022-09-26 14:58 Mike Gilbert
2022-09-02 15:39 Mike Gilbert
2022-09-01 22:17 Matt Turner
2022-08-30 5:07 Arthur Zamarin
2022-07-20 21:02 Sam James
2022-06-25 10:35 Arthur Zamarin
2022-06-23 5:19 Sam James
2022-06-20 18:05 Mike Gilbert
2022-06-20 15:10 Mike Gilbert
2022-06-10 7:11 Agostino Sarubbo
2022-06-10 6:48 Agostino Sarubbo
2022-06-08 1:05 Mike Gilbert
2021-12-15 4:56 Mike Gilbert
2021-09-16 12:32 Marek Szuba
2021-09-14 14:02 Mike Gilbert
2021-09-07 17:28 Mike Gilbert
2021-09-07 17:28 Mike Gilbert
2021-09-07 17:28 Mike Gilbert
2021-08-11 19:11 Sam James
2021-06-30 10:56 Agostino Sarubbo
2021-06-30 10:55 Agostino Sarubbo
2021-06-30 10:55 Agostino Sarubbo
2021-06-30 10:54 Agostino Sarubbo
2021-06-08 19:59 Mike Gilbert
2021-04-22 19:50 Mike Gilbert
2021-04-21 3:38 Matt Turner
2021-04-04 18:55 Andreas Sturmlechner
2021-03-28 7:14 Sam James
2021-03-27 18:25 Agostino Sarubbo
2021-03-26 17:51 Mike Gilbert
2021-03-26 15:16 Mike Gilbert
2021-03-26 14:24 Agostino Sarubbo
2021-03-26 13:40 Agostino Sarubbo
2021-03-25 23:17 Sam James
2021-03-17 14:49 Mike Gilbert
2021-03-17 14:49 Mike Gilbert
2021-03-17 14:49 Mike Gilbert
2021-03-14 15:34 Mike Gilbert
2020-12-29 23:53 Sam James
2020-11-06 16:14 Mike Gilbert
2020-11-06 2:45 Georgy Yakovlev
2020-10-20 18:28 Mike Gilbert
2020-09-30 18:41 Matt Turner
2020-09-07 8:55 David Seifert
2020-08-05 0:14 Sam James
2020-05-09 15:57 Thomas Deutschmann
2020-04-19 2:35 Craig Andrews
2020-03-15 18:34 Mike Gilbert
2020-03-04 22:53 Mike Gilbert
2020-03-01 19:29 Matt Turner
2020-03-01 18:05 Mike Gilbert
2020-02-16 20:24 David Seifert
2020-01-13 9:12 Agostino Sarubbo
2020-01-13 9:10 Agostino Sarubbo
2020-01-13 9:06 Agostino Sarubbo
2020-01-13 9:04 Agostino Sarubbo
2020-01-13 8:45 Agostino Sarubbo
2020-01-12 17:29 Mike Gilbert
2020-01-11 18:30 Mike Gilbert
2020-01-11 18:26 Mike Gilbert
2019-12-29 19:18 Mike Gilbert
2019-12-07 11:00 Sergei Trofimovich
2019-12-07 11:00 Sergei Trofimovich
2019-07-10 15:03 Mike Gilbert
2019-07-08 23:36 Mike Gilbert
2019-07-08 23:36 Mike Gilbert
2019-07-08 23:36 Mike Gilbert
2019-07-08 23:36 Mike Gilbert
2019-06-26 18:37 Mike Gilbert
2019-05-03 19:05 Mike Gilbert
2019-04-18 1:01 Mike Gilbert
2019-04-15 16:14 Mike Gilbert
2019-04-15 16:14 Mike Gilbert
2019-04-15 16:14 Mike Gilbert
2019-03-21 15:55 Mike Gilbert
2019-03-21 4:29 Mike Gilbert
2019-03-21 4:29 Mike Gilbert
2019-03-21 4:29 Mike Gilbert
2019-03-21 4:29 Mike Gilbert
2019-03-21 3:39 Mike Gilbert
2019-03-21 3:39 Mike Gilbert
2019-03-21 3:26 Mike Gilbert
2019-03-21 3:12 Mike Gilbert
2019-02-10 1:27 Lars Wendler
2018-11-28 9:58 Michał Górny
2018-11-18 11:27 Mikle Kolyada
2018-09-14 5:56 Matt Turner
2018-09-13 3:42 Matt Turner
2018-08-13 14:55 Mike Gilbert
2018-08-13 14:43 Luca Barbato
2018-07-01 14:00 Mike Gilbert
2018-06-26 14:45 Mike Gilbert
2018-06-26 14:45 Mike Gilbert
2018-06-26 14:45 Mike Gilbert
2018-05-07 19:46 Mikle Kolyada
2018-05-07 19:40 Thomas Deutschmann
2018-05-05 23:12 Mike Gilbert
2018-05-04 21:21 Mike Gilbert
2018-05-04 21:05 Mike Gilbert
2018-05-04 21:05 Mike Gilbert
2018-02-01 20:37 Thomas Deutschmann
2017-12-31 21:49 Michał Górny
2017-12-31 21:49 Michał Górny
2017-12-14 14:53 Thomas Deutschmann
2017-12-14 12:00 Thomas Deutschmann
2017-10-26 20:26 Ian Stakenvicius
2017-09-01 20:17 Ian Stakenvicius
2017-07-18 14:56 Mike Gilbert
2017-06-22 18:32 Mike Gilbert
2017-06-17 17:24 Agostino Sarubbo
2017-06-16 14:10 Agostino Sarubbo
2017-04-27 17:14 Mike Gilbert
2017-03-17 21:08 Mike Gilbert
2017-02-16 20:39 Mike Gilbert
2017-02-14 23:08 Robin H. Johnson
2017-02-14 15:42 Robin H. Johnson
2017-02-04 19:35 Mike Gilbert
2017-02-04 19:31 Mike Gilbert
2016-12-21 22:54 Thomas Deutschmann
2016-10-04 20:58 Ian Stakenvicius
2016-09-18 21:12 Mike Gilbert
2016-09-10 20:02 Mike Gilbert
2016-08-24 18:11 Mike Gilbert
2016-08-18 13:00 Mike Gilbert
2016-08-18 13:00 Mike Gilbert
2016-08-18 13:00 Mike Gilbert
2016-08-14 22:31 Mike Gilbert
2016-08-13 19:33 Mike Gilbert
2016-08-13 19:33 Mike Gilbert
2016-08-11 14:22 William Hubbs
2016-08-10 2:45 William Hubbs
2016-08-10 2:35 William Hubbs
2016-06-29 2:27 Mike Gilbert
2016-06-29 2:27 Mike Gilbert
2016-04-27 17:53 Mike Gilbert
2016-04-27 16:20 Mike Gilbert
2016-04-18 9:43 Patrice Clement
2016-03-05 22:53 Mikle Kolyada
2016-03-05 16:08 Mikle Kolyada
2016-03-04 22:12 Mike Gilbert
2016-02-25 3:04 Mike Gilbert
2015-12-18 16:55 Mike Gilbert
2015-12-17 15:30 Mike Gilbert
2015-12-17 13:48 Agostino Sarubbo
2015-12-17 13:48 Agostino Sarubbo
2015-12-12 17:38 Mike Gilbert
2015-12-12 17:38 Mike Gilbert
2015-12-08 21:24 Ian Stakenvicius
2015-12-08 20:14 Ian Stakenvicius
2015-12-08 20:00 Ian Stakenvicius
2015-12-08 17:30 Doug Goldstein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox