aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-09-04 00:21:34 +0000
committerArmin Kuster <akuster808@gmail.com>2019-09-07 08:34:22 -0700
commit303800de96ec3ed3971f316cf0308f409761336c (patch)
treed3723b9be57e639b893305740e87ba16cc04f970
parenta6a431f6adc33f91f4df5bfde024f69399fea7f5 (diff)
downloadmeta-security-303800de96ec3ed3971f316cf0308f409761336c.tar.gz
meta-security-303800de96ec3ed3971f316cf0308f409761336c.tar.bz2
meta-security-303800de96ec3ed3971f316cf0308f409761336c.zip
scap-security-guide: add depends on openscap-native do_install
This ensures openscap-native does install the needed patches security guilde needs to build Minor recipe cleanup too Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc7
1 files 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"