This ensures openscap-native does install the needed patches
security guilde needs to build
Minor recipe cleanup too
Signed-off-by: Armin Kuster <akuster...@gmail.com>
---
.../scap-security-guide/scap-security-guide.inc | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
index 341721a..3212310 100644
---
a/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
+++
b/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
@@ -7,14 +7,11 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=97662e4486d9a1d09f358851d9f41a1a"
LICENSE = "LGPL-2.1"
DEPENDS = "openscap-native python3 python3-pyyaml-native python3-jinja2-native
libxml2-native"
-RDEPENDS_${PN} = "openscap"
S = "${WORKDIR}/git"
inherit cmake pkgconfig python3native
-#PARALLEL_MAKE = ""
-
STAGING_OSCAP_BUILDDIR = "${TMPDIR}/work-shared/openscap/oscap-build-artifacts"
OECMAKE_GENERATOR = "Unix Makefiles"
@@ -23,9 +20,13 @@ EXTRA_OECMAKE += "-DENABLE_PYTHON_COVERAGE=OFF"
B = "${S}/build"
+do_configure[depends] += "openscap-native:do_install"
+
do_configure_prepend () {
sed -i -e 's:NAMES\ sed:NAMES\ ${HOSTTOOLS_DIR}/sed:g' ${S}/CMakeLists.txt
sed -i -e 's:NAMES\ grep:NAMES\ ${HOSTTOOLS_DIR}/grep:g'
${S}/CMakeLists.txt
}
FILES_${PN} += "${datadir}/xml"
+
+RDEPENDS_${PN} = "openscap"
--
2.17.1
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
