diff mbox series

[isar-cip-core] Fix OVMF binary installation for buster

Message ID 3ebfa607-276b-a3c6-9611-90c62c33ed08@siemens.com (mailing list archive)
State Handled Elsewhere
Headers show
Series [isar-cip-core] Fix OVMF binary installation for buster | expand

Commit Message

Jan Kiszka April 8, 2022, 7:28 a.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

We have to use the backports version for buster unconditionally because
start-qemu.sh relies on files from that package since f65269cdbeb9.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas/opt/ebg-secure-boot-snakeoil.yml | 6 ------
 kas/opt/efibootguard.yml             | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index d404df5..a7d644b 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -31,9 +31,3 @@  local_conf_header:
     # Add snakeoil binaries for qemu
     IMAGER_BUILD_DEPS += "ebg-secure-boot-snakeoil"
     IMAGER_INSTALL += "ebg-secure-boot-snakeoil"
-
-  ovmf: |
-    # snakeoil certs are only part of backports, for Debian 11 and later the are not necessary
-    OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
-    DISTRO_APT_SOURCES_append_buster = " conf/distro/debian-buster-backports.list"
-    DISTRO_APT_PREFERENCES_append_buster = " conf/distro/preferences.ovmf-snakeoil.conf"
diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 9624584..0502b9c 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -30,3 +30,7 @@  local_conf_header:
   ovmf-binaries: |
     # Add ovmf binaries for qemu
     IMAGER_BUILD_DEPS += "ovmf-binaries"
+    # not needed Debian 11 and later
+    OVERRIDES_append = ":${BASE_DISTRO_CODENAME}"
+    DISTRO_APT_SOURCES_append_buster = " conf/distro/debian-buster-backports.list"
+    DISTRO_APT_PREFERENCES_append_buster = " conf/distro/preferences.ovmf-snakeoil.conf"