meson, mkosi: pull in jinja2 as required

In preparation for subsequent changes.

diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch
index 867a869e1afc015abcb0fd682ee1387c8209dedf..e0cd6f483409c27e8eaf1646eddf4bc2e861aa31 100644 (file)
--- 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 b1173a67dc4b725abdc38bf7c3ea452788e2121d..cf3f3364b525061ac81439e3355d5b844151dab5 100644 (file)
--- 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 a069d8c84e68956f797d6cef5ddf3d6992c27b03..efce52e1e8b069009eac95a39f333a39336c235c 100644 (file)
--- 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 15f70a4352834327d59e474084009ad60dca96e0..387f0af70c0f1d2587336c40702b0741af97a631 100644 (file)
--- 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 dd1036fc854fc48fbb2e3a259b72513d807529e7..29df6ee238628d82dbb48e709453cd2155e89627 100644 (file)
--- 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 955dc11e1b0f06256e4050cc88fef78fe8f4c868..88057d2d95d0e1ad07e8ddd2d0207d18453054e5 100644 (file)
--- 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 a8bbeacd859faba4e49f7c342415027b685685bc..5dc083f47f2436338ac9542d1e0fe21b0edd3576 100644 (file)
--- 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 = '''