From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 1 Aug 2024 09:10:13 +0000 (+0200)
Subject: Use apt search patterns a little more
X-Git-Tag: v25~374^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d9683c98544534d3b4d2f97a9c353073cb6ec24;p=thirdparty%2Fmkosi.git

Use apt search patterns a little more

Let's use apt search patterns more to match packages that are only
available on specific ubuntu/debian releases.
---

diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
index 7f91220ee..6b7813c6a 100644
--- a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
+++ b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf
@@ -6,6 +6,8 @@ Distribution=|ubuntu
 
 [Content]
 Packages=
+        ?exact-name(systemd-boot)
+        ?exact-name(systemd-resolved)
         ^libtss2-esys-[0-9.]+-0$
         ^libtss2-mu[0-9.-]+$
         bash
diff --git a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf b/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
deleted file mode 100644
index 4fa991635..000000000
--- a/mkosi.conf.d/30-debian-ubuntu/mkosi.conf.d/20-systemd-extra.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Release=!jammy
-
-[Content]
-Packages=
-        systemd-boot
-        systemd-resolved
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
index 69c4bdf5a..d7c4612dd 100644
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf
@@ -6,8 +6,12 @@ Distribution=|ubuntu
 
 [Content]
 Packages=
+        ?exact-name(grub-pc-bin)
+        ?exact-name(systemd-boot)
         ?exact-name(systemd-repart)
         ?exact-name(systemd-ukify)
+        ?exact-name(ubuntu-keyring)
+        ?exact-name(virtiofsd)
         apt
         archlinux-keyring
         btrfs-progs
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/grub.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/grub.conf
deleted file mode 100644
index 2ab4230d4..000000000
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/grub.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Architecture=x86-64
-
-[Content]
-Packages=
-        grub-pc-bin
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/systemd-boot.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/systemd-boot.conf
deleted file mode 100644
index a31acd147..000000000
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/systemd-boot.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=|!ubuntu
-Release=|!jammy
-
-[Content]
-Packages=
-        systemd-boot
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/ubuntu-keyring.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/ubuntu-keyring.conf
deleted file mode 100644
index a94ac4ab4..000000000
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/ubuntu-keyring.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=|!debian
-Release=|!bookworm
-
-[Content]
-Packages=
-        ubuntu-keyring
diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/virtiofsd.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/virtiofsd.conf
deleted file mode 100644
index 8c2b285bd..000000000
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-ubuntu/mkosi.conf.d/virtiofsd.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-# Install virtiofsd except on Ubuntu Jammy and Debian Bookworm.
-
-[Match]
-Distribution=|!ubuntu
-Release=|!jammy
-
-[Match]
-Distribution=|!debian
-Release=|!bookworm
-
-[Content]
-Packages=
-        virtiofsd