mkosi-tools: Move linux-perf package definition into shared logic

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf
similarity index 52%
rename from mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf
rename to mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf
index 50dfa11db42628b286e25ce6d092ad34f63923bc..3aaddca3a26292d66fd4522e0a3d0ef995129db6 100644 (file)
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian.conf
+++ b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-debian-kali-ubuntu/mkosi.conf.d/linux-perf.conf
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Match]
-Distribution=debian
+Distribution=|debian
+Distribution=|kali
 
 [Content]
-Packages=
-        linux-perf
+Packages=linux-perf

diff --git a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf b/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf
deleted file mode 100644 (file)
index 5b4a0aa..0000000
--- a/mkosi/resources/mkosi-tools/mkosi.conf.d/10-kali.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-[Match]
-Distribution=kali
-
-[Content]
-Packages=
-        linux-perf