diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-10 15:33:31 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-02-10 16:05:32 +0100 |
| commit | 39a6a5169bf8271980592d779d3ee986ddfcf4c3 (patch) | |
| tree | bb754e182f1552a2c5bef9fc3e0267f6a9a90d30 /mkosi.conf.d | |
| parent | a4d7819d1510aaad254f5edcf9cda8b9ea898b90 (diff) | |
| download | systemd-39a6a5169bf8271980592d779d3ee986ddfcf4c3.tar.gz | |
mkosi: Use globs instead of prepare script to install extra packages
This allows us to install everything in the same dnf command instead
of having to use a prepare script to run dnf from within the image.
This is a hack until mkosi supports release specific dropin files.
Diffstat (limited to 'mkosi.conf.d')
| -rw-r--r-- | mkosi.conf.d/centos/10-centos.conf | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf index ce6eafe31b..94aeaed9c9 100644 --- a/mkosi.conf.d/centos/10-centos.conf +++ b/mkosi.conf.d/centos/10-centos.conf @@ -3,6 +3,10 @@ # This is a settings file for OS image generation using mkosi (https://github.com/systemd/mkosi). # Symlink this file to mkosi.default in the project root directory and invoke "mkosi" to build an OS image. +# We use python3*dist() throughout this file because we need to make sure the python3.9dis() packages are +# installed on CentOS Stream 8. mkosi doesn't support release specific configuration yet so we use the globs +# to get the necessary packages on both CentOS Stream 8 and CentOS Stream 9. + [Distribution] Distribution=centos Repositories=epel @@ -37,7 +41,10 @@ Packages= polkit popt procps-ng - python3dist(pefile) + python3*dist(pefile) + python3*dist(pluggy) # python39-pluggy is a pytest dependency that's not installed for some reason. + python3*dist(pytest) + python39 quota tpm2-tss vim-common @@ -91,7 +98,6 @@ BuildPackages= pkgconfig(tss2-rc) pkgconfig(valgrind) pkgconfig(xkbcommon) - python3dist(docutils) - python3dist(jinja2) - python3dist(lxml) - python3dist(pytest) + python3*dist(docutils) + python3*dist(jinja2) + python3*dist(lxml) |