You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
1.9 KiB
59 lines
1.9 KiB
1 month ago
|
From 9802a28b367b3d403c41b570949e3c91f505ede5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luca Boccassi <bluca@debian.org>
|
||
|
|
Date: Sun, 16 Jun 2024 20:42:12 +0100
|
||
|
|
Subject: [PATCH] mkosi: install EFI packages only on EFI architectures
|
||
|
|
|
||
|
|
sbsigntool, systemd-boot and systemd-boot-efi do not exist on other
|
||
|
|
architectures
|
||
|
|
|
||
|
|
(cherry picked from commit 47fe3f29b4ba1b44ae71a7e67c579c4883731dd4)
|
||
|
|
---
|
||
|
|
.../mkosi.conf.d/10-debian-ubuntu/mkosi.conf | 3 ---
|
||
|
|
.../10-debian-ubuntu/mkosi.conf.d/efi.conf | 16 ++++++++++++++++
|
||
|
|
2 files changed, 16 insertions(+), 3 deletions(-)
|
||
|
|
create mode 100644 mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf
|
||
|
|
|
||
|
|
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
|
||
|
|
index ae014fa966..ecac78049d 100644
|
||
|
|
--- a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
|
||
|
|
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
|
||
|
|
@@ -20,8 +20,6 @@ VolatilePackages=
|
||
|
|
libsystemd-dev
|
||
|
|
libudev-dev
|
||
|
|
systemd
|
||
|
|
- systemd-boot
|
||
|
|
- systemd-boot-efi
|
||
|
|
systemd-container
|
||
|
|
systemd-coredump
|
||
|
|
systemd-dev
|
||
|
|
@@ -74,7 +72,6 @@ Packages=
|
||
|
|
python3-pexpect
|
||
|
|
python3-psutil
|
||
|
|
quota
|
||
|
|
- sbsigntool
|
||
|
|
softhsm2
|
||
|
|
squashfs-tools
|
||
|
|
stress
|
||
|
|
diff --git a/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf
|
||
|
|
new file mode 100644
|
||
|
|
index 0000000000..781670a775
|
||
|
|
--- /dev/null
|
||
|
|
+++ b/mkosi.images/system/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/efi.conf
|
||
|
|
@@ -0,0 +1,16 @@
|
||
|
|
+# SPDX-License-Identifier: LGPL-2.1-or-later
|
||
|
|
+# sbsigntool exists only on UEFI architectures
|
||
|
|
+
|
||
|
|
+[Match]
|
||
|
|
+Architecture=|x86
|
||
|
|
+Architecture=|x86-64
|
||
|
|
+Architecture=|arm
|
||
|
|
+Architecture=|arm64
|
||
|
|
+Architecture=|riscv32
|
||
|
|
+Architecture=|riscv64
|
||
|
|
+
|
||
|
|
+[Content]
|
||
|
|
+Packages=
|
||
|
|
+ sbsigntool
|
||
|
|
+ systemd-boot
|
||
|
|
+ systemd-boot-efi
|