]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi/fedora: use pkgconfig virtual provides to refer to packages
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 19 May 2021 08:52:17 +0000 (10:52 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 19 May 2021 08:54:08 +0000 (10:54 +0200)
... and /usr/bin/ path for a library package which provides an executable we
care about (libxslt).

This way the mkosi dependency list corresponds directly to the names which are
used in the dependency() and find_program() lines in meson.build. It also makes
the thing more resilient to package splits and renames.

.mkosi/mkosi.fedora

index 547044648a9ed1c20bc8d17c2be994d48d23f20a..22e311e1039786fdd81bccc9f6d10098c9e9d4c1 100644 (file)
@@ -9,13 +9,8 @@ Release=34
 
 [Packages]
 BuildPackages=
-        audit-libs-devel
-        bzip2-devel
-        cryptsetup-devel
-        dbus-devel
         diffutils
         docbook-style-xsl
-        elfutils-devel
         findutils
         gcc
         gettext
@@ -23,44 +18,51 @@ BuildPackages=
         glibc-minimal-langpack
         gnu-efi
         gnu-efi-devel
-        gnutls-devel
         gperf
-        iptables-devel
-        kmod-devel
-        libacl-devel
-        libblkid-devel
-        libcap-devel
-        libcurl-devel
-        libfdisk-devel
-        libfido2-devel
-        libgcrypt-devel
-        libidn2-devel
-        libmicrohttpd-devel
-        libmount-devel
-        libpwquality-devel
-        libseccomp-devel
-        libselinux-devel
-        libxkbcommon-devel
-        libxslt
-        libzstd-devel
         lz4
-        lz4-devel
         meson
         ninja-build
-        openssl-devel
-        p11-kit-devel
         pam-devel
-        pcre2-devel
         pkgconfig
-        python3-lxml
+        pkgconfig(audit)
+        pkgconfig(blkid)
+        pkgconfig(bzip2)
+        pkgconfig(dbus-1)
+        pkgconfig(fdisk)
+        pkgconfig(gnutls)
+        pkgconfig(libacl)
+        pkgconfig(libcap)
+        pkgconfig(libcryptsetup)
+        pkgconfig(libcurl)
+        pkgconfig(libdw)
+        pkgconfig(libfido2)
+        pkgconfig(libgcrypt)
+        pkgconfig(libidn2)
+        pkgconfig(libiptc)
+        pkgconfig(libkmod)
+        pkgconfig(liblz4)
+        pkgconfig(liblzma)
+        pkgconfig(libmicrohttpd)
+        pkgconfig(libpcre2-8)
+        pkgconfig(libqrencode)
+        pkgconfig(libseccomp)
+        pkgconfig(libselinux)
+        pkgconfig(libzstd)
+        pkgconfig(mount)
+        pkgconfig(openssl)
+        pkgconfig(p11-kit-1)
+        pkgconfig(pwquality)
+        pkgconfig(tss2-esys)
+        pkgconfig(tss2-mu)
+        pkgconfig(tss2-rc)
+        pkgconfig(valgrind)
+        pkgconfig(xkbcommon)
         python3dist(jinja2)
-        qrencode-devel
+        python3dist(lxml)
         rpm
-        tpm2-tss-devel
         tree
-        valgrind-devel
-        xz-devel
         zstd
+        /usr/bin/xsltproc
 
 Packages=
         gdb