]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi: Narrow glob used to install python packages
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 27 Mar 2023 11:23:40 +0000 (13:23 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 27 Mar 2023 12:03:42 +0000 (14:03 +0200)
Let's make sure we only install the python3 and python39 python
packages, instead of all the packages of all versions that are
packaged.

This also fixes the CentOS 8 CI because python3.11-pytest was failing
to install.

We have to ship our own powertools repo definition because we need to
enable module_hotfixes for powertools to coerce dnf into installing
some of the python packages.

mkosi.conf.d/centos/10-centos.conf
mkosi.conf.d/centos/mkosi.reposdir/powertools.repo [new file with mode: 0644]

index 606942273f51568a1305ded21ecb903a896b6b7a..2532b35f51ed63379a23b30c5c9899522d400d12 100644 (file)
@@ -10,6 +10,7 @@
 [Distribution]
 Distribution=centos
 Repositories=epel
+RepositoryDirectory=mkosi.conf.d/centos/mkosi.reposdir
 
 [Content]
 Packages=
@@ -44,9 +45,9 @@ Packages=
         polkit
         popt
         procps-ng
-        python3*dist(pefile)
-        python3*dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
-        python3*dist(pytest)
+        python3[.][9]dist(pefile)
+        python3[.][9]dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason.
+        python3[.][9]dist(pytest)
         python39
         quota
         tpm2-tss
diff --git a/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo b/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo
new file mode 100644 (file)
index 0000000..5c7149a
--- /dev/null
@@ -0,0 +1,8 @@
+[powertools-hotfixes]
+name=powertools-hotfixes
+mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools
+gpgkey=https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official
+gpgcheck=1
+enabled=1
+module_hotfixes=1
+skip_if_unavailable=1