From ffafb00e45ad693da27662f13976f6a8247820c6 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Mon, 23 Nov 2020 16:26:21 -0500 Subject: [PATCH] python3-jinja2: Fix ptest RDEPENDS and file installation jinja2's ptest is failing when running meta-python-ptest-image. This is happening for two reasons: 1) python3-jinja2 is in oe-core, but the ptests are disabled. 2) python3-toml is required for the ptest; Because of #1, do_install_ptest doesn't actually run and so no tests are installed for ptest-runner to use. This patch adds do_install_ptest to the bbappend file for jinja2, and also adds python3-toml to the ptest RDEPENDS so that it will install the tests and run correctly. Signed-off-by: Trevor Gamblin Signed-off-by: Khem Raj --- .../python/python3-jinja2_2.%.bbappend | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend b/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend index 91814e6cd..9fe358427 100644 --- a/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend +++ b/meta-python/recipes-devtools/python/python3-jinja2_2.%.bbappend @@ -1,2 +1,13 @@ # Main recipe was moved to oe-core, but with ptest disabled inherit ${@bb.utils.filter('DISTRO_FEATURES', 'ptest', d)} + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + +RDEPENDS_${PN}-ptest += " \ + ${PYTHON_PN}-pytest \ + ${PYTHON_PN}-toml \ + ${PYTHON_PN}-unixadmin \ +"