commit: ed552f6d59ebb74594841e0c3d79be45bda1781e Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de> AuthorDate: Fri Oct 18 21:08:57 2019 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Oct 29 21:11:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed552f6d
sys-boot/grub: add platform xen_pvh Closes: https://bugs.gentoo.org/697978 Closes: https://github.com/gentoo/gentoo/pull/13334 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> profiles/arch/powerpc/package.use.mask | 2 +- profiles/desc/grub_platforms.desc | 1 + sys-boot/grub/grub-2.04-r1.ebuild | 4 +++- sys-boot/grub/grub-9999.ebuild | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index 444f0f94f38..67dd6101c60 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -46,7 +46,7 @@ net-analyzer/icinga2 mariadb # Luca Barbato <lu_z...@gentoo.org> (2018-08-12) # grub pc is not supported on powerpc -sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen +sys-boot/grub:2 grub_platforms_pc grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_xen grub_platforms_xen-pvh # Luke Dashjr <luke-jr+gentoob...@utopios.org> (2018-06-08) # Requires unported sys-libs/netbsd-csu diff --git a/profiles/desc/grub_platforms.desc b/profiles/desc/grub_platforms.desc index ef7153c971a..b5978a32dba 100644 --- a/profiles/desc/grub_platforms.desc +++ b/profiles/desc/grub_platforms.desc @@ -18,3 +18,4 @@ qemu-mips - QEMU MIPS platform support uboot - U-Boot platform support xen - XEN (pvgrub2) platform support xen-32 - Build 32-bit XEN (pvgrub2) platform support on amd64 +xen-pvh - XEN (pvhgrub2) platform support diff --git a/sys-boot/grub/grub-2.04-r1.ebuild b/sys-boot/grub/grub-2.04-r1.ebuild index 81bd769728c..7135f70c7f9 100644 --- a/sys-boot/grub/grub-2.04-r1.ebuild +++ b/sys-boot/grub/grub-2.04-r1.ebuild @@ -55,7 +55,7 @@ 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 ) +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=" @@ -105,6 +105,7 @@ DEPEND=" 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? ( @@ -177,6 +178,7 @@ grub_configure() { case ${MULTIBUILD_VARIANT} in efi*) platform=efi ;; + xen-pvh) platform=xen_pvh ;; xen*) platform=xen ;; guessed) ;; *) platform=${MULTIBUILD_VARIANT} ;; diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index 07f21fac670..6b165af8248 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -54,7 +54,7 @@ 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 ) +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=" @@ -104,6 +104,7 @@ DEPEND=" 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? ( @@ -176,6 +177,7 @@ grub_configure() { case ${MULTIBUILD_VARIANT} in efi*) platform=efi ;; + xen-pvh) platform=xen_pvh ;; xen*) platform=xen ;; guessed) ;; *) platform=${MULTIBUILD_VARIANT} ;;
