Merge ~slyon/ubuntu/+source/edk2:lp-2106771-libvirt-amdsev-ovmf-plucky into ubuntu/+source/edk2:ubuntu/plucky-devel

[Lukas Märdian]

PPA: https://launchpad.net/~slyon/+archive/ubuntu/lp-2106771-libvirt-amdsev-ovmf/+packages

DEP-8:
$ ppa tests ppa:slyon/lp-2106771-libvirt-amdsev-ovmf -r plucky -L
[...]
* Results:
  - edk2: plucky/edk2/2025.02-3ubuntu2.1~ppa2 [amd64]
    + ✅ edk2 on plucky for amd64 @ 28.04.25 07:52:47
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-slyon-lp-2106771-libvirt-amdsev-ovmf/plucky/amd64/e/edk2/20250428_075247_fca9d@/log.gz
  - edk2: plucky/edk2/2025.02-3ubuntu2.1~ppa2 [arm64]
    + ✅ edk2 on plucky for arm64 @ 28.04.25 08:14:37
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-slyon-lp-2106771-libvirt-amdsev-ovmf/plucky/arm64/e/edk2/20250428_081437_56ee3@/log.gz
  - edk2: plucky/edk2/2025.02-3ubuntu2.1~ppa2 [armhf]
    + ✅ edk2 on plucky for armhf @ 28.04.25 07:54:15
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-slyon-lp-2106771-libvirt-amdsev-ovmf/plucky/armhf/e/edk2/20250428_075415_eca91@/log.gz
  - edk2: plucky/edk2/2025.02-3ubuntu2.1~ppa2 [i386]
    + ✅ edk2 on plucky for i386 @ 28.04.25 10:28:27
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-slyon-lp-2106771-libvirt-amdsev-ovmf/plucky/i386/e/edk2/20250428_102827_be8a4@/log.gz
  - edk2: plucky/edk2/2025.02-3ubuntu2.1~ppa2 [ppc64el]
    + ✅ edk2 on plucky for ppc64el @ 28.04.25 08:03:01
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-slyon-lp-2106771-libvirt-amdsev-ovmf/plucky/ppc64el/e/edk2/20250428_080301_f9358@/log.gz
  - edk2: plucky/edk2/2025.02-3ubuntu2.1~ppa2 [s390x]
    + ✅ edk2 on plucky for s390x @ 28.04.25 07:51:37
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-slyon-lp-2106771-libvirt-amdsev-ovmf/plucky/s390x/e/edk2/20250428_075137_0a95d@/log.gz

Unmerged commits

1c056fd... by Lukas Märdian on 2025-04-24

changelog

ab3f49a... by Lukas Märdian on 2025-04-24

d/descriptors: Add amd-sev JSON

cfdab92... by Lukas Märdian on 2025-04-23

d/rules: Build OVMF.amdsev.fd (LP: #2106771)

diff --git a/debian/changelog b/debian/changelog
index b353a3a..de4cf69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+edk2 (2025.02-3ubuntu2.1) plucky; urgency=medium
+
+  * d/rules: Build OVMF.amdsev.fd (LP: #2106771)
+  * d/descriptors: Add amd-sev JSON
+
+ -- Lukas Märdian <[e-mail]>  Thu, 24 Apr 2025 16:58:02 +0200
+
 edk2 (2025.02-3ubuntu2) plucky; urgency=medium
 
   * Uninstall memory attribute protocol in all images, workaround for (LP: #2104316)
diff --git a/debian/descriptors/60-edk2-x86_64-amdsev.json b/debian/descriptors/60-edk2-x86_64-amdsev.json
new file mode 100644
index 0000000..78dac81
--- /dev/null
+++ b/debian/descriptors/60-edk2-x86_64-amdsev.json
@@ -0,0 +1,31 @@
+{
+    "description": "UEFI firmware for x86_64, with SEV-ES support",
+    "interface-types": [
+        "uefi"
+    ],
+    "mapping": {
+        "device": "flash",
+        "mode": "stateless",
+        "executable": {
+            "filename": "/usr/share/ovmf/OVMF.amdsev.fd",
+            "format": "raw"
+        }
+    },
+    "targets": [
+        {
+            "architecture": "x86_64",
+            "machines": [
+                "pc-q35-*"
+            ]
+        }
+    ],
+    "features": [
+        "amd-sev",
+        "amd-sev-es",
+        "amd-sev-snp",
+        "verbose-dynamic"
+    ],
+    "tags": [
+
+    ]
+}
diff --git a/debian/ovmf.install b/debian/ovmf.install
index 85d09be..483e2b0 100644
--- a/debian/ovmf.install
+++ b/debian/ovmf.install
@@ -1,4 +1,5 @@
 debian/ovmf-install/OVMF.fd		/usr/share/ovmf
+debian/ovmf-install/OVMF.amdsev.fd	/usr/share/ovmf
 debian/ovmf-install/OVMF_CODE*.fd	/usr/share/OVMF
 debian/ovmf-install/OVMF_VARS*.fd	/usr/share/OVMF
 debian/descriptors/*-edk2-x86_64*.json	/usr/share/qemu/firmware
diff --git a/debian/rules b/debian/rules
index 86a99f5..cd3d290 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,10 +73,12 @@ debian/setup-build-stamp:
 OVMF_INSTALL_DIR = debian/ovmf-install
 OVMF64_BUILD_ROOT = Build/OvmfX64
 OVMF64_BUILD_DIR = $(OVMF64_BUILD_ROOT)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN)
+AMDSEV_BUILD_ROOT = Build/AmdSev
+AMDSEV_BUILD_DIR = $(AMDSEV_BUILD_ROOT)/$(BUILD_TYPE)_$(EDK2_TOOLCHAIN)
 OVMF_ENROLL = $(OVMF_INSTALL_DIR)/EnrollDefaultKeys.efi
 OVMF_SHELL =  $(OVMF_INSTALL_DIR)/Shell.efi
 OVMF_BINARIES = $(OVMF_ENROLL) $(OVMF_SHELL)
-OVMF_IMAGES := $(addprefix $(OVMF_INSTALL_DIR)/,OVMF_CODE_4M.fd OVMF_CODE_4M.secboot.fd OVMF_VARS_4M.fd)
+OVMF_IMAGES := $(addprefix $(OVMF_INSTALL_DIR)/,OVMF_CODE_4M.fd OVMF_CODE_4M.secboot.fd OVMF_VARS_4M.fd OVMF.amdsev.fd)
 OVMF_PREENROLLED_VARS := $(addprefix $(OVMF_INSTALL_DIR)/,OVMF_VARS_4M.ms.fd OVMF_VARS_4M.snakeoil.fd)
 
 OVMF32_INSTALL_DIR = debian/ovmf32-install
@@ -161,6 +163,15 @@ $(OVMF_BINARIES) $(OVMF_IMAGES): debian/setup-build-stamp
 		$(OVMF_INSTALL_DIR)/
 	cp $(OVMF64_BUILD_DIR)/FV/OVMF_CODE.fd \
 		$(OVMF_INSTALL_DIR)/OVMF_CODE_4M.secboot.fd
+	rm -rf $(AMDSEV_BUILD_ROOT)
+	touch OvmfPkg/AmdSev/Grub/grub.efi
+	set -e; . ./edksetup.sh; \
+		build -a X64 \
+			-t $(EDK2_TOOLCHAIN) \
+			-p OvmfPkg/AmdSev/AmdSevX64.dsc \
+			$(OVMF_COMMON_FLAGS) -b $(BUILD_TYPE)
+	cp $(AMDSEV_BUILD_DIR)/FV/OVMF.fd \
+		$(OVMF_INSTALL_DIR)/OVMF.amdsev.fd
 
 ifeq ($(call dpkg_vendor_derives_from_v1,ubuntu),yes)
 debian/PkKek-1-vendor.pem: debian/PkKek-1-Ubuntu.pem