| Message ID | 20191109213352.13020-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/jailhouse: python scripts needs python-mako | expand |
On Sat, 9 Nov 2019 22:33:52 +0100 Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote: > jailhouse-config-create script needs python-mako, see > https://github.com/siemens/jailhouse/commit/5c7f2c4c30f19aa7eb95dffa7b7bb92393c09ba7 > > Moreover jailhouse-config-create needs host-python-mako to build > jailhouse-config-collect > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > package/jailhouse/Config.in | 1 + > package/jailhouse/jailhouse.mk | 12 +++++++++--- > 2 files changed, 10 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > jailhouse-config-create script needs python-mako, see > https://github.com/siemens/jailhouse/commit/5c7f2c4c30f19aa7eb95dffa7b7bb92393c09ba7 > Moreover jailhouse-config-create needs host-python-mako to build > jailhouse-config-collect > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2019.08.x, thanks.
diff --git a/package/jailhouse/Config.in b/package/jailhouse/Config.in index 5b9ecc7b7b..d270a2ae8e 100644 --- a/package/jailhouse/Config.in +++ b/package/jailhouse/Config.in @@ -16,6 +16,7 @@ if BR2_PACKAGE_JAILHOUSE config BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS bool "Jailhouse helper scripts" depends on BR2_PACKAGE_PYTHON + select BR2_PACKAGE_PYTHON_MAKO # runtime help Python-based helpers for the Jailhouse Hypervisor. diff --git a/package/jailhouse/jailhouse.mk b/package/jailhouse/jailhouse.mk index fa74f9e8c4..aab232eb92 100644 --- a/package/jailhouse/jailhouse.mk +++ b/package/jailhouse/jailhouse.mk @@ -18,10 +18,16 @@ JAILHOUSE_MAKE_OPTS = \ DESTDIR="$(TARGET_DIR)" ifeq ($(BR2_PACKAGE_JAILHOUSE_HELPER_SCRIPTS),y) -JAILHOUSE_DEPENDENCIES += host-python-setuptools -JAILHOUSE_MAKE_OPTS += PYTHON_PIP_USABLE="yes" +JAILHOUSE_DEPENDENCIES += \ + host-python-mako \ + host-python-setuptools +JAILHOUSE_MAKE_OPTS += \ + HAS_PYTHON_MAKO="yes" \ + PYTHON_PIP_USABLE="yes" else -JAILHOUSE_MAKE_OPTS += PYTHON_PIP_USABLE="no" +JAILHOUSE_MAKE_OPTS += \ + HAS_PYTHON_MAKO="no" \ + PYTHON_PIP_USABLE="no" endif define JAILHOUSE_BUILD_CMDS
jailhouse-config-create script needs python-mako, see https://github.com/siemens/jailhouse/commit/5c7f2c4c30f19aa7eb95dffa7b7bb92393c09ba7 Moreover jailhouse-config-create needs host-python-mako to build jailhouse-config-collect Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/jailhouse/Config.in | 1 + package/jailhouse/jailhouse.mk | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)