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>
---
 production-config | 2 ++
 ts-xen-build-prep | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/production-config b/production-config
index 9d2e7e0ee492..b77763a19443 100644
--- 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 67b3eae62155..e76c0254bfd0 100755
--- 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 () {
-- 
Anthony PERARD

Anthony PERARD writes ("[OSSTEST PATCH v2] 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")

LGTM assuming Roger is also happy...

Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

-- 
Ian Jackson <ijackson@chiark.greenend.org.uk>   These opinions are my own.  

Pronouns: they/he.  If I emailed you from @fyvzl.net or @evade.org.uk,
that is a private address which bypasses my fierce spamfilter.

On Fri, May 20, 2022 at 05:57:43PM +0100, Ian Jackson wrote:
> Anthony PERARD writes ("[OSSTEST PATCH v2] 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")
> 
> LGTM assuming Roger is also happy...
> 
> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Sure, I'm gonna push this now then.

Thanks both, Roger.