From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 May 2021 13:31:00 +0000 (+0200)
Subject: meson, mkosi: pull in jinja2 as required
X-Git-Tag: v249-rc1~210^2~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0698c66f4569c91e3fdd54ca77449698ae38704;p=thirdparty%2Fsystemd.git

meson, mkosi: pull in jinja2 as required

In preparation for subsequent changes.
---

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 867a869e1af..e0cd6f48340 100644
--- a/.mkosi/mkosi.arch
+++ b/.mkosi/mkosi.arch
@@ -41,6 +41,7 @@ BuildPackages=
         pkgconfig
         python
         python-lxml
+        python-jinja
         qrencode
         rsync
         xz
diff --git a/.mkosi/mkosi.debian b/.mkosi/mkosi.debian
index b1173a67dc4..cf3f3364b52 100644
--- a/.mkosi/mkosi.debian
+++ b/.mkosi/mkosi.debian
@@ -51,6 +51,7 @@ BuildPackages=
         pkg-config
         python3
         python3-lxml
+        python3-jinja2
         tree
         uuid-dev
         xsltproc
diff --git a/.mkosi/mkosi.fedora b/.mkosi/mkosi.fedora
index a069d8c84e6..efce52e1e8b 100644
--- a/.mkosi/mkosi.fedora
+++ b/.mkosi/mkosi.fedora
@@ -55,6 +55,7 @@ BuildPackages=
         pkgconfig
         python3-devel
         python3-lxml
+        python3dist(jinja2)
         qrencode-devel
         rpm
         tpm2-tss-devel
diff --git a/.mkosi/mkosi.opensuse b/.mkosi/mkosi.opensuse
index 15f70a43528..387f0af70c0 100644
--- a/.mkosi/mkosi.opensuse
+++ b/.mkosi/mkosi.opensuse
@@ -37,6 +37,7 @@ BuildPackages=
         pcre-devel
         python3
         python3-lxml
+        python3-jinja2
         qrencode-devel
         system-user-nobody
         systemd-sysvinit
diff --git a/.mkosi/mkosi.ubuntu b/.mkosi/mkosi.ubuntu
index dd1036fc854..29df6ee2386 100644
--- a/.mkosi/mkosi.ubuntu
+++ b/.mkosi/mkosi.ubuntu
@@ -54,6 +54,7 @@ BuildPackages=
         pkg-config
         python3
         python3-lxml
+        python3-jinja2
         tree
         tzdata
         uuid-dev
diff --git a/README b/README
index 955dc11e1b0..88057d2d95d 100644
--- a/README
+++ b/README
@@ -190,6 +190,7 @@ REQUIREMENTS:
         gperf
         docbook-xsl (optional, required for documentation)
         xsltproc    (optional, required for documentation)
+        python-jinja2
         python-lxml (optional, required to build the indices)
         python >= 3.5
         meson >= 0.46 (>= 0.49 is required to build position-independent executables)
diff --git a/meson.build b/meson.build
index a8bbeacd859..5dc083f47f2 100644
--- a/meson.build
+++ b/meson.build
@@ -655,6 +655,12 @@ endif
 
 ############################################################
 
+if run_command('python3', '-c', 'import jinja2').returncode() != 0
+        error('python3 jinja2 missing')
+endif
+
+############################################################
+
 gperf = find_program('gperf')
 
 gperf_test_format = '''