From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 5 Apr 2023 08:23:58 +0000 (+0200)
Subject: Revert "mkosi: Drop python-docutils"
X-Git-Tag: v254-rc1~804
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89c8328fc946521fbc4f7bbbc4ca3b0f81eba93f;p=thirdparty%2Fsystemd.git

Revert "mkosi: Drop python-docutils"

This reverts commit be266f49d6b7e3f021e2a07f937d39d1f14a283d.

Turns out we installed this because it's required by the bpf selftests
so let's keep it intact.
---

diff --git a/mkosi.conf.d/arch/10-arch.conf b/mkosi.conf.d/arch/10-arch.conf
index 0e16aa26f78..30333cff3a9 100644
--- a/mkosi.conf.d/arch/10-arch.conf
+++ b/mkosi.conf.d/arch/10-arch.conf
@@ -45,6 +45,7 @@ BuildPackages=
         linux-api-headers
         pahole
         perl
+        python-docutils
         python-jinja
         python-lxml
         python-pyelftools
diff --git a/mkosi.conf.d/centos/10-centos.conf b/mkosi.conf.d/centos/10-centos.conf
index 921cff2f72a..ff26e3611fd 100644
--- a/mkosi.conf.d/centos/10-centos.conf
+++ b/mkosi.conf.d/centos/10-centos.conf
@@ -102,6 +102,7 @@ BuildPackages=
         pkgconfig(tss2-rc)
         pkgconfig(valgrind)
         pkgconfig(xkbcommon)
+        python3-docutils
         python3[.][9]dist(jinja2)
         python3[.][9]dist(lxml)
         python3[.][9]dist(pyelftools)
diff --git a/mkosi.conf.d/debian/10-debian.conf b/mkosi.conf.d/debian/10-debian.conf
index cbe58ee0d01..c3e582b8ecf 100644
--- a/mkosi.conf.d/debian/10-debian.conf
+++ b/mkosi.conf.d/debian/10-debian.conf
@@ -90,6 +90,7 @@ BuildPackages=
         libxkbcommon-dev
         libzstd-dev
         pahole
+        python3-docutils
         python3-jinja2
         python3-lxml
         python3-pyelftools
diff --git a/mkosi.conf.d/fedora/10-fedora.conf b/mkosi.conf.d/fedora/10-fedora.conf
index f19ff93821d..b263cce6738 100644
--- a/mkosi.conf.d/fedora/10-fedora.conf
+++ b/mkosi.conf.d/fedora/10-fedora.conf
@@ -92,6 +92,7 @@ BuildPackages=
         pkgconfig(valgrind)
         pkgconfig(xencontrol)
         pkgconfig(xkbcommon)
+        python3-docutils
         python3dist(jinja2)
         python3dist(lxml)
         python3dist(pyelftools)
diff --git a/mkosi.conf.d/opensuse/10-opensuse.conf b/mkosi.conf.d/opensuse/10-opensuse.conf
index 00d7429df5b..1e03c79cff2 100644
--- a/mkosi.conf.d/opensuse/10-opensuse.conf
+++ b/mkosi.conf.d/opensuse/10-opensuse.conf
@@ -93,6 +93,7 @@ BuildPackages=
         pciutils-devel
         pcre-devel
         popt-devel
+        python3-docutils
         python3-Jinja2
         python3-lxml
         python3-pyelftools
diff --git a/mkosi.conf.d/ubuntu/10-ubuntu.conf b/mkosi.conf.d/ubuntu/10-ubuntu.conf
index b754ebe3072..51898475b0b 100644
--- a/mkosi.conf.d/ubuntu/10-ubuntu.conf
+++ b/mkosi.conf.d/ubuntu/10-ubuntu.conf
@@ -91,6 +91,7 @@ BuildPackages=
         libxkbcommon-dev
         libzstd-dev
         pahole
+        python3-docutils
         python3-jinja2
         python3-lxml
         python3-pyelftools