diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 15:31:00 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:24:43 +0900 |
| commit | e0698c66f4569c91e3fdd54ca77449698ae38704 (patch) | |
| tree | 9d6cd0c6e0850d275618a248a6d9f3675a9c5b81 | |
| parent | be21b60b8993aa75b35c40c15b23cd32972a2c1b (diff) | |
| download | systemd-e0698c66f4569c91e3fdd54ca77449698ae38704.tar.gz | |
meson, mkosi: pull in jinja2 as required
In preparation for subsequent changes.
| -rw-r--r-- | .mkosi/mkosi.arch | 1 | ||||
| -rw-r--r-- | .mkosi/mkosi.debian | 1 | ||||
| -rw-r--r-- | .mkosi/mkosi.fedora | 1 | ||||
| -rw-r--r-- | .mkosi/mkosi.opensuse | 1 | ||||
| -rw-r--r-- | .mkosi/mkosi.ubuntu | 1 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | meson.build | 6 |
7 files changed, 12 insertions, 0 deletions
diff --git a/.mkosi/mkosi.arch b/.mkosi/mkosi.arch index 867a869e1a..e0cd6f4834 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 b1173a67dc..cf3f3364b5 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 a069d8c84e..efce52e1e8 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 15f70a4352..387f0af70c 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 dd1036fc85..29df6ee238 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 @@ -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 a8bbeacd85..5dc083f47f 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 = ''' |