ts-xen-build-prep: Install newer NASM version, to build OVMF

Recent versions of OVMF now need a version of NASM that is newer
than the one available on Debian oldstable/buster. They want to use
NASM 2.15.05 [1], which is available in Debian stable/bullseye. The
need to use a newer version started with d3febfd9ade3 ("MdePkg:
Replace Opcode with the corresponding instructions.").

There is no backport package available but the nasm package from
Debian Bullseye can easily be installed on Buster as it has few
dependencies and are already satisfied.

[1] https://github.com/tianocore/edk2/commit/6a890db161cd6d378bec3499a1e774db3f5a27a7
    ("BaseTools: Upgrade the version of NASM tool")

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/production-config b/production-config
index 95d663ddc10f9d79286a4bb9b9f73630a27223c3..0ca981a1a3760fa2786026c64a814867c120f3fe 100644 (file)
--- a/production-config
+++ b/production-config
@@ -112,6 +112,8 @@ DebianExtraPackages_jessie chiark-scripts_6.0.3~citrix1_all.deb
 DebianExtraPackages_stretch chiark-scripts_6.0.4~citrix1_all.deb
 DebianExtraPackages_buster chiark-scripts_6.0.5~citrix1_all.deb libc-kernel-bug.960271/linux-libc-dev_4.19.118-2.0iwj_.deb
 
+DebianExtraPackages_build_buster nasm_2.15.05-1_.deb
+
 DebianExtraPackages_uefi_i386_jessie   extradebs-uefi-i386-2018-04-01/
 DebianExtraPackages_uefi_amd64_jessie  extradebs-uefi-amd64-2018-04-01/
 DebianExtraPackages_uefi_i386_stretch  extradebs-uefi-i386-2018-04-01/

diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index 67b3eae621551788481875a923e974ec54608697..e76c0254bfd062b76471e5ce292034bba8bad0ae 100755 (executable)
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -250,6 +250,8 @@ END
     if ($ho->{Arch} eq 'amd64' && $ho->{Suite} !~ m/squeeze|lenny/) {
         target_install_packages($ho, 'libc6-dev-i386');
     }
+
+    some_extradebs($ho, [ 'DebianExtraPackages', 'build', $ho->{Suite} ]);
 }
 
 sub ccache_setup () {