| 1 |
commit: d61119fb4ea2112ed2f08be53566d75b4b325e97 |
| 2 |
Author: Douglas Freed <dwfreed <AT> mtu <DOT> edu> |
| 3 |
AuthorDate: Wed Jun 29 01:43:11 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 29 01:52:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d61119fb |
| 7 |
|
| 8 |
sys-boot/grub: add xen-32 platform |
| 9 |
|
| 10 |
This builds 32-bit Xen on amd64. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/586996 |
| 13 |
|
| 14 |
profiles/arch/amd64/package.use.mask | 4 ++++ |
| 15 |
profiles/base/package.use.mask | 4 ++++ |
| 16 |
profiles/desc/grub_platforms.desc | 1 + |
| 17 |
sys-boot/grub/grub-2.02_beta3-r1.ebuild | 8 +++++++- |
| 18 |
sys-boot/grub/grub-9999-r1.ebuild | 8 +++++++- |
| 19 |
5 files changed, 23 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask |
| 22 |
index 178c46c..3640f08 100644 |
| 23 |
--- a/profiles/arch/amd64/package.use.mask |
| 24 |
+++ b/profiles/arch/amd64/package.use.mask |
| 25 |
@@ -18,6 +18,10 @@ |
| 26 |
|
| 27 |
#--- END OF EXAMPLES --- |
| 28 |
|
| 29 |
+# Mike Gilbert <floppym@g.o> (23 Jun 2016) |
| 30 |
+# This flag only has meaning on amd64 |
| 31 |
+sys-boot/grub:2 -grub_platforms_xen-32 |
| 32 |
+ |
| 33 |
# Nathan Phillip Brink <binki@g.o> (26 Sep 2015) |
| 34 |
# git useflag requires dev-libs/libgit2 which few arches support |
| 35 |
dev-util/geany-plugins -git |
| 36 |
|
| 37 |
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask |
| 38 |
index 6030b44..22e3fd8 100644 |
| 39 |
--- a/profiles/base/package.use.mask |
| 40 |
+++ b/profiles/base/package.use.mask |
| 41 |
@@ -5,6 +5,10 @@ |
| 42 |
# This file requires >=portage-2.1.1 |
| 43 |
# New entries go on top. |
| 44 |
|
| 45 |
+# Mike Gilbert <floppym@g.o> (23 Jun 2016) |
| 46 |
+# This flag only has meaning on amd64 |
| 47 |
+sys-boot/grub:2 grub_platforms_xen-32 |
| 48 |
+ |
| 49 |
# Brian Evans <grknight@g.o> (14 Jun 2016) |
| 50 |
# Igbinary is not ready for php 7 |
| 51 |
>=dev-php/pecl-redis-3.0 igbinary |
| 52 |
|
| 53 |
diff --git a/profiles/desc/grub_platforms.desc b/profiles/desc/grub_platforms.desc |
| 54 |
index dcb57b2..2ba24c6 100644 |
| 55 |
--- a/profiles/desc/grub_platforms.desc |
| 56 |
+++ b/profiles/desc/grub_platforms.desc |
| 57 |
@@ -18,3 +18,4 @@ qemu - QEMU platform support |
| 58 |
qemu-mips - QEMU MIPS platform support |
| 59 |
uboot - U-Boot platform support |
| 60 |
xen - XEN (pvgrub2) platform support |
| 61 |
+xen-32 - Build 32-bit XEN (pvgrub2) platform support on amd64 |
| 62 |
|
| 63 |
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild |
| 64 |
index 7fd67ee..fd6f5f2 100644 |
| 65 |
--- a/sys-boot/grub/grub-2.02_beta3-r1.ebuild |
| 66 |
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild |
| 67 |
@@ -51,7 +51,7 @@ LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" |
| 68 |
SLOT="2/${PVR}" |
| 69 |
IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs" |
| 70 |
|
| 71 |
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen ) |
| 72 |
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) |
| 73 |
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" |
| 74 |
|
| 75 |
REQUIRED_USE=" |
| 76 |
@@ -85,6 +85,7 @@ DEPEND="${RDEPEND} |
| 77 |
sys-apps/texinfo |
| 78 |
fonts? ( media-libs/freetype:2 ) |
| 79 |
grub_platforms_xen? ( app-emulation/xen-tools:= ) |
| 80 |
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= ) |
| 81 |
static? ( |
| 82 |
app-arch/xz-utils[static-libs(+)] |
| 83 |
truetype? ( |
| 84 |
@@ -180,6 +181,11 @@ grub_configure() { |
| 85 |
local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
| 86 |
export TARGET_CFLAGS TARGET_CPPFLAGS |
| 87 |
fi ;; |
| 88 |
+ xen-32) |
| 89 |
+ platform=xen |
| 90 |
+ if [[ ${CHOST} == x86_64* ]]; then |
| 91 |
+ local CTARGET=i386 |
| 92 |
+ fi ;; |
| 93 |
guessed) ;; |
| 94 |
*) platform=${MULTIBUILD_VARIANT} ;; |
| 95 |
esac |
| 96 |
|
| 97 |
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild |
| 98 |
index c880d12..b0c7084 100644 |
| 99 |
--- a/sys-boot/grub/grub-9999-r1.ebuild |
| 100 |
+++ b/sys-boot/grub/grub-9999-r1.ebuild |
| 101 |
@@ -48,7 +48,7 @@ LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" |
| 102 |
SLOT="2/${PVR}" |
| 103 |
IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs" |
| 104 |
|
| 105 |
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen ) |
| 106 |
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 ) |
| 107 |
IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" |
| 108 |
|
| 109 |
REQUIRED_USE=" |
| 110 |
@@ -82,6 +82,7 @@ DEPEND="${RDEPEND} |
| 111 |
sys-apps/texinfo |
| 112 |
fonts? ( media-libs/freetype:2 ) |
| 113 |
grub_platforms_xen? ( app-emulation/xen-tools:= ) |
| 114 |
+ grub_platforms_xen-32? ( app-emulation/xen-tools:= ) |
| 115 |
static? ( |
| 116 |
app-arch/xz-utils[static-libs(+)] |
| 117 |
truetype? ( |
| 118 |
@@ -181,6 +182,11 @@ grub_configure() { |
| 119 |
local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}" |
| 120 |
export TARGET_CFLAGS TARGET_CPPFLAGS |
| 121 |
fi ;; |
| 122 |
+ xen-32) |
| 123 |
+ platform=xen |
| 124 |
+ if [[ ${CHOST} == x86_64* ]]; then |
| 125 |
+ local CTARGET=i386 |
| 126 |
+ fi ;; |
| 127 |
guessed) ;; |
| 128 |
*) platform=${MULTIBUILD_VARIANT} ;; |
| 129 |
esac |
Archives