From 23d059aeca5aa5690dcd7b4d0ad44992db340045 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 17 May 2018 18:50:44 +0100
Subject: [PATCH] ts-xen-install: Install additional .debs for UEFI

grub2 from stretch cannot boot Xen under UEFI.  But that from buster
can, and it can be simply installed, even on jessie.  So do that.

I have copied the binaries for 2.02+dfsg1-4 to
images/grub2-uefi-amd64-2018-04-01 in Massachusetts.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 production-config |  5 +++++
 ts-xen-install    | 11 +++++++++++
 2 files changed, 16 insertions(+)

diff --git a/production-config b/production-config
index e1c437b..aa414d0 100644
--- a/production-config
+++ b/production-config
@@ -106,6 +106,11 @@ MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio
 # Update with ./mg-netgrub-loader-update
 TftpGrubVersion XXXX-XX-XX
 
+ExtraDebs_uefi_i386_jessie   2018-04-01
+ExtraDebs_uefi_amd64_jessie  2018-04-01
+ExtraDebs_uefi_i386_stretch  2018-04-01
+ExtraDebs_uefi_amd64_stretch 2018-04-01
+
 XenUsePath /usr/groups/xencore/systems/bin/xenuse
 XenUseUser osstest
 
diff --git a/ts-xen-install b/ts-xen-install
index fa7d7db..a9f8631 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -72,6 +72,16 @@ sub packages () {
         if toolstack($ho)->{ExtraPackages};
 }
 
+sub extradebs () {
+    my $firmware = get_host_property($ho, "firmware", "bios");
+    my $version = $c{ "ExtraDebs_${firmware}_$r{arch}_$ho->{Suite}" };
+    return unless $version;
+    target_install_packages($ho, 'rsync');
+    my $extradebs = "$c{Images}/extradebs-$firmware-$r{arch}-$version";
+    target_putfile_root($ho,300, "$extradebs/.", 'extradebs', '-r');
+    target_cmd_root($ho,"dpkg --force-confold -iGROEB extradebs </dev/null",300);
+}
+
 sub extract () {
     my @parts = ('', 'kern', 'xen');
     push @parts, 'libvirt' if $r{toolstack} eq "libvirt";
@@ -369,6 +379,7 @@ if ($checkmode) {
     $ho= $hos[0];
     
     packages();
+    extradebs();
     extract();
     forbidden();
     adjustconfig();
-- 
2.39.5