Skip to contentSkip to conversation

package/jailhouse: python scripts needs python-mako

PATCH New Fabrice Fontaine 3 participants 3 messages Nov 9, 2019 – Nov 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/jailhouse: python scripts needs python-mako

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

---
 package/jailhouse/Config.in    |  1 +
 package/jailhouse/jailhouse.mk | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
package/jailhouse/Config.in +1 -0
index 5b9ecc7b7b..d270a2ae8e 100644
@@ -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.
 
package/jailhouse/jailhouse.mk +9 -3
index fa74f9e8c4..aab232eb92 100644
@@ -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
Signature · 1 line
2.23.0
#1 lore raw

PATCH 1/1 package/jailhouse: python scripts needs python-mako

Quoted 11 lines · On Sat, 9 Nov 2019 22:33:52 +0100 Fabrice Fontaine…

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

---
 package/jailhouse/Config.in    |  1 +
 package/jailhouse/jailhouse.mk | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/jailhouse: python scripts needs python-mako

In reply to Fabrice Fontaine
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> 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

Committed to 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard