meta-security: subtree update:30ea7a89dc..d75dc96fa3
Armin Kuster (11):
python-scapy: drop py2 package
packagegroup-core-security-ptest: only included if ptest is enabled
packagegroup-core-security: update package name
busybox: fix sig changes when layer added
initramfs-framework-ima: correct IMA_POLICY name
apparmor: drop lsb RDEPENDS
openscap: Drop nostamp
scap-security-guide: add depends on openscap-native do_install
cryptsetup-tpm-incubator: fix QA error RDEPENDS
oe-scap: Fix QA RDEPENDS error
suricata: update to 4.1.4
Stefan Agner (1):
libseccomp: build static library always
Change-Id: Ia2f8aec978de4f3d20c13be3c12b70a7badc29d5
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
index 341721a..3212310 100644
--- a/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
+++ b/meta-security/meta-security-compliance/recipes-openscap/scap-security-guide/scap-security-guide.inc
@@ -7,14 +7,11 @@
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 @@
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"