mkosi: Drop unnecessary [Match] sections

These are already satisfied in every path that includes pkgenv.conf.

(cherry picked from commit a4488ae6ae34612edd96212e5e4ee94bcc561b49)

diff --git a/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
index 6624458331312692e8222a0532e5d9c40e9bf1f2..5513d5218409b5b247d9708a9859398a9745ac42 100644 (file)
--- a/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
+++ b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=arch
-
 [Build]
 Environment=
         GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git

diff --git a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
index 22ab093fcf182a2ea42f78cbc57e154f4171c731..65eca48116c996890e19d5519914f069781ae8a5 100644 (file)
--- a/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
+++ b/mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=|centos
-Distribution=|fedora
-
 [Build]
 Environment=
         GIT_URL=https://src.fedoraproject.org/rpms/systemd.git

diff --git a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
index 42beff4500c0bd7704c0bacc57b192cdc1afc3a1..04982dc33246f86a162dd85abc78ff15db15fac7 100644 (file)
--- a/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
+++ b/mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=|debian
-Distribution=|ubuntu
-
 [Build]
 Environment=
         GIT_URL=https://salsa.debian.org/systemd-team/systemd.git

diff --git a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
index b2e93ef3520a177a7acbe0b579100ed642ab8992..4cbd40e6c8e75a2d6085e321df08cad4d3ccdf57 100644 (file)
--- a/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
+++ b/mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf
@@ -1,8 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-[Match]
-Distribution=opensuse
-
 [Build]
 Environment=
         GIT_URL=https://github.com/bmwiedemann/openSUSE