From a4488ae6ae34612edd96212e5e4ee94bcc561b49 Mon Sep 17 00:00:00 2001 From: DaanDeMeyer Date: Wed, 9 Jul 2025 10:31:39 +0200 Subject: [PATCH] mkosi: Drop unnecessary [Match] sections These are already satisfied in every path that includes pkgenv.conf. --- mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf | 3 --- mkosi/mkosi.conf.d/centos-fedora/mkosi.conf.d/pkgenv.conf | 4 ---- mkosi/mkosi.conf.d/debian-ubuntu/mkosi.conf.d/pkgenv.conf | 4 ---- mkosi/mkosi.conf.d/opensuse/mkosi.conf.d/pkgenv.conf | 3 --- 4 files changed, 14 deletions(-) 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 ba8508925e3..07e4f48d3b0 100644 --- 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 d617c332396..8324883f679 100644 --- 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 a8d547db99d..18a2e01ba35 100644 --- 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 0721a2e24df..6a29c266756 100644 --- 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 -- 2.47.3