From: Daan De Meyer Date: Mon, 27 Mar 2023 11:23:40 +0000 (+0200) Subject: mkosi: Narrow glob used to install python packages X-Git-Tag: v254-rc1~909 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89de1d983ea84d7147011c52b55aa47a7cce862c;p=thirdparty%2Fsystemd.git mkosi: Narrow glob used to install python packages 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. --- diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf index 606942273f5..2532b35f51e 100644 --- a/mkosi.conf.d/centos/10-centos.conf +++ b/mkosi.conf.d/centos/10-centos.conf @@ -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 index 00000000000..5c7149a1233 --- /dev/null +++ b/mkosi.conf.d/centos/mkosi.reposdir/powertools.repo @@ -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