| 1 |
commit: ed552f6d59ebb74594841e0c3d79be45bda1781e |
| 2 |
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de> |
| 3 |
AuthorDate: Fri Oct 18 21:08:57 2019 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 29 21:11:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed552f6d |
| 7 |
|
| 8 |
sys-boot/grub: add platform xen_pvh |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/697978 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/13334 |
| 12 |
Package-Manager: Portage-2.3.76, Repoman-2.3.16 |
| 13 |
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de> |
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
|
| 16 |
profiles/arch/powerpc/package.use.mask | 2 +- |
| 17 |
profiles/desc/grub_platforms.desc | 1 + |
| 18 |
sys-boot/grub/grub-2.04-r1.ebuild | 4 +++- |
| 19 |
sys-boot/grub/grub-9999.ebuild | 4 +++- |
| 20 |
4 files changed, 8 insertions(+), 3 deletions(-) |
| 21 |
|
| 22 |
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask |
| 23 |
index 444f0f94f38..67dd6101c60 100644 |
| 24 |
--- a/profiles/arch/powerpc/package.use.mask |
| 25 |
+++ b/profiles/arch/powerpc/package.use.mask |
| 26 |
@@ -46,7 +46,7 @@ net-analyzer/icinga2 mariadb |
| 27 |
|
| 28 |
# Luca Barbato <lu_zero@g.o> (2018-08-12) |
| 29 |
# grub pc is not supported on powerpc |
| 30 |
-sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen |
| 31 |
+sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen grub_platforms_xen-pvh |
| 32 |
|
| 33 |
# Luke Dashjr <luke-jr+gentoobugs@×××××××.org> (2018-06-08) |
| 34 |
# Requires unported sys-libs/netbsd-csu |
| 35 |
|
| 36 |
diff --git a/profiles/desc/grub_platforms.desc b/profiles/desc/grub_platforms.desc |
| 37 |
index ef7153c971a..b5978a32dba 100644 |
| 38 |
--- a/profiles/desc/grub_platforms.desc |
| 39 |
+++ b/profiles/desc/grub_platforms.desc |
| 40 |
@@ -18,3 +18,4 @@ qemu-mips - QEMU MIPS platform support |
| 41 |
uboot - U-Boot platform support |
| 42 |
xen - XEN (pvgrub2) platform support |
| 43 |
xen-32 - Build 32-bit XEN (pvgrub2) platform support on amd64 |
| 44 |
+xen-pvh - XEN (pvhgrub2) platform support |
| 45 |
|
| 46 |
diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild |
| 47 |
index 81bd769728c..7135f70c7f9 100644 |
| 48 |
--- a/sys-boot/grub/grub-2.04-r1.ebuild |
| 49 |
+++ b/sys-boot/grub/grub-2.04-r1.ebuild |
| 50 |
@@ -55,7 +55,7 @@ LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" |
| 51 |
SLOT="2/${PVR}" |
| 52 |
IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" |
| 53 |
|
| 54 |
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) |
| 55 |
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh ) |
| 56 |
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" |
| 57 |
|
| 58 |
REQUIRED_USE=" |
| 59 |
@@ -105,6 +105,7 @@ DEPEND=" |
| 60 |
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) |
| 61 |
grub_platforms_xen? ( app-emulation/xen-tools:= ) |
| 62 |
grub_platforms_xen-32? ( app-emulation/xen-tools:= ) |
| 63 |
+ grub_platforms_xen-pvh? ( app-emulation/xen-tools:= ) |
| 64 |
" |
| 65 |
RDEPEND="${DEPEND} |
| 66 |
kernel_linux? ( |
| 67 |
@@ -177,6 +178,7 @@ grub_configure() { |
| 68 |
|
| 69 |
case ${MULTIBUILD_VARIANT} in |
| 70 |
efi*) platform=efi ;; |
| 71 |
+ xen-pvh) platform=xen_pvh ;; |
| 72 |
xen*) platform=xen ;; |
| 73 |
guessed) ;; |
| 74 |
*) platform=${MULTIBUILD_VARIANT} ;; |
| 75 |
|
| 76 |
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild |
| 77 |
index 07f21fac670..6b165af8248 100644 |
| 78 |
--- a/sys-boot/grub/grub-9999.ebuild |
| 79 |
+++ b/sys-boot/grub/grub-9999.ebuild |
| 80 |
@@ -54,7 +54,7 @@ LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" |
| 81 |
SLOT="2/${PVR}" |
| 82 |
IUSE="device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs" |
| 83 |
|
| 84 |
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) |
| 85 |
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 xen-pvh ) |
| 86 |
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" |
| 87 |
|
| 88 |
REQUIRED_USE=" |
| 89 |
@@ -104,6 +104,7 @@ DEPEND=" |
| 90 |
ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) |
| 91 |
grub_platforms_xen? ( app-emulation/xen-tools:= ) |
| 92 |
grub_platforms_xen-32? ( app-emulation/xen-tools:= ) |
| 93 |
+ grub_platforms_xen-pvh? ( app-emulation/xen-tools:= ) |
| 94 |
" |
| 95 |
RDEPEND="${DEPEND} |
| 96 |
kernel_linux? ( |
| 97 |
@@ -176,6 +177,7 @@ grub_configure() { |
| 98 |
|
| 99 |
case ${MULTIBUILD_VARIANT} in |
| 100 |
efi*) platform=efi ;; |
| 101 |
+ xen-pvh) platform=xen_pvh ;; |
| 102 |
xen*) platform=xen ;; |
| 103 |
guessed) ;; |
| 104 |
*) platform=${MULTIBUILD_VARIANT} ;; |
Archives