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 a28167f8bf935bc727b746be23c3558d52f7a9c3..fdce9fbea303561deec021428e1dc2b0e90d227a 100644 (file)
--- 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 c76c01f14bc6fc2254775d7eeb04295471d7a81c..aef35a38adb175f39ae2101c16b3f7b71d0ffe87 100644 (file)
--- 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)