From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 Apr 2023 10:34:49 +0000 (+0200)
Subject: mkosi: default to Fedora 38
X-Git-Tag: v254-rc1~705
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=451812680755bdf62512bc3c174278280d5ce9cb;p=thirdparty%2Fsystemd.git

mkosi: default to Fedora 38

It'll be out this week. We can't update the man pages before it is realeased,
but we can use it for mkosi builds and do some very late testing.

Also, use filepath specification for /bin/pkg-config. We need it for meson, and
meson calls it directly by this path. pkgconfig is a virtual Provides on
pkgconf-pkg-config, and the indirection here just obfuscates things with no
benefit.

Add it explicitly for centos too. (I think it is pulled in by packages which
contain pkg-config modules anyway, but it's better to be explicit).
---

diff --git a/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf
index a28167f8bf9..fdce9fbea30 100644
--- a/mkosi.conf.d/20-centos.conf
+++ b/mkosi.conf.d/20-centos.conf
@@ -57,6 +57,7 @@ BuildPackages=
         libxslt
         pam-devel
         perl-interpreter
+        /usr/bin/pkg-config
         pkgconfig(alsa)
         pkgconfig(audit)
         pkgconfig(blkid)
diff --git a/mkosi.conf.d/20-fedora.conf b/mkosi.conf.d/20-fedora.conf
index c76c01f14bc..aef35a38adb 100644
--- a/mkosi.conf.d/20-fedora.conf
+++ b/mkosi.conf.d/20-fedora.conf
@@ -4,7 +4,7 @@
 Distribution=fedora
 
 [Distribution]
-Release=37
+Release=38
 
 [Content]
 Packages=
@@ -56,7 +56,7 @@ BuildPackages=
         glibc-static
         libcap-static
         pam-devel
-        pkgconfig # pkgconf shim to provide /usr/bin/pkg-config
+        /usr/bin/pkg-config
         pkgconfig(alsa)
         pkgconfig(audit)
         pkgconfig(blkid)