summaryrefslogtreecommitdiff
path: root/mkosi.conf.d
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-04-16 12:34:49 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-04-16 15:22:54 +0200
commit451812680755bdf62512bc3c174278280d5ce9cb (patch)
treea951e3679b971a20af9b43f5f0665ae6bfb01217 /mkosi.conf.d
parent8521338f95142203cb29c85113c13f9301fcee6a (diff)
downloadsystemd-451812680755bdf62512bc3c174278280d5ce9cb.tar.gz
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).
Diffstat (limited to 'mkosi.conf.d')
-rw-r--r--mkosi.conf.d/20-centos.conf1
-rw-r--r--mkosi.conf.d/20-fedora.conf4
2 files changed, 3 insertions, 2 deletions
diff --git a/mkosi.conf.d/20-centos.conf b/mkosi.conf.d/20-centos.conf
index a28167f8bf..fdce9fbea3 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 c76c01f14b..aef35a38ad 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)