From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Vr8L2-0001gy-OG for mharc-grub-devel@gnu.org; Thu, 12 Dec 2013 10:38:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vr8Kw-0001WW-BR for grub-devel@gnu.org; Thu, 12 Dec 2013 10:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vr8Ks-0006J3-9x for grub-devel@gnu.org; Thu, 12 Dec 2013 10:38:02 -0500 Received: from v6.chiark.greenend.org.uk ([2001:ba8:1e3::]:46922 helo=chiark.greenend.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vr8Ks-0006Il-4f for grub-devel@gnu.org; Thu, 12 Dec 2013 10:37:58 -0500 Received: from [172.20.153.9] (helo=riva.pelham.vpn.ucam.org) by chiark.greenend.org.uk (Debian Exim 4.72 #1) with esmtps (return-path cjwatson@ubuntu.com) id 1Vr8Kr-0001tu-K8; Thu, 12 Dec 2013 15:37:57 +0000 Received: from ns1.pelham.vpn.ucam.org ([172.20.153.2] helo=riva.ucam.org) by riva.pelham.vpn.ucam.org with esmtps (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1Vr8Kq-0002Oj-UI; Thu, 12 Dec 2013 15:37:57 +0000 Date: Thu, 12 Dec 2013 15:37:55 +0000 From: Colin Watson To: grub-devel@gnu.org, xen-devel@lists.xen.org Subject: [PATCH 4/4] Improve installation on Xen. Message-ID: <20131212153755.GE1431@riva.ucam.org> References: <20131212153643.GA1431@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131212153643.GA1431@riva.ucam.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:ba8:1e3:: X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Dec 2013 15:38:07 -0000 * util/grub-install.c: Copy core image to GRUBDIR/grub.xen on Xen platforms. --- ChangeLog | 7 +++++++ util/grub-install.c | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58304f7..f280b59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-12-12 Colin Watson + Improve installation on Xen. + + * util/grub-install.c: Copy core image to GRUBDIR/grub.xen on Xen + platforms. + +2013-12-12 Colin Watson + Build grub.xen. * .gitignore: Add xen.cfg. diff --git a/util/grub-install.c b/util/grub-install.c index 5d22f90..2da05c2 100644 --- a/util/grub-install.c +++ b/util/grub-install.c @@ -1576,6 +1576,15 @@ main (int argc, char *argv[]) } break; + case GRUB_INSTALL_PLATFORM_I386_XEN: + case GRUB_INSTALL_PLATFORM_X86_64_XEN: + { + char *dst = grub_util_path_concat (2, grubdir, "grub.xen"); + grub_install_copy_file (imgfile, dst, 1); + free (dst); + } + break; + case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON: case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS: case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS: @@ -1584,8 +1593,6 @@ main (int argc, char *argv[]) case GRUB_INSTALL_PLATFORM_MIPSEL_ARC: case GRUB_INSTALL_PLATFORM_ARM_UBOOT: case GRUB_INSTALL_PLATFORM_I386_QEMU: - case GRUB_INSTALL_PLATFORM_I386_XEN: - case GRUB_INSTALL_PLATFORM_X86_64_XEN: grub_util_warn ("%s", _("WARNING: no platform-specific install was performed")); break; -- 1.8.4.4