From 1fdf4aa48a5446689546be41e10dd0e8832605d6 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Mon, 9 Sep 2019 14:56:41 -0400
Subject: 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>
---
 .../recipes-openscap/oe-scap/oe-scap_1.0.bb                        | 2 +-
 .../recipes-openscap/openscap/openscap.inc                         | 5 ++---
 .../recipes-openscap/scap-security-guide/scap-security-guide.inc   | 7 ++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'meta-security/meta-security-compliance/recipes-openscap')

diff --git a/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
index e84ed30f8..fd53fcba5 100644
--- a/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
+++ b/meta-security/meta-security-compliance/recipes-openscap/oe-scap/oe-scap_1.0.bb
@@ -30,4 +30,4 @@ do_install () {
 
 FILES_${PN} += "${datadir}/oe-scap"
 
-RDEPENDS_${PN} = "openscap"
+RDEPENDS_${PN} = "openscap bash"
diff --git a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
index ed8d8ffa7..afa576a9b 100644
--- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
+++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
@@ -40,15 +40,14 @@ do_configure_append_class-native () {
     sed -i 's:OSCAP_DEFAULT_XSLT_PATH.*$:OSCAP_DEFAULT_XSLT_PATH "${STAGING_OSCAP_BUILDDIR}${datadir_native}/openscap/xsl":' ${B}/config.h
 }
 
-do_clean[cleandirs] += "${STAGING_OSCAP_BUILDDIR}"
-do_install[nostamp] = "1"
-
+do_install_class-native[cleandirs] += " ${STAGING_OSCAP_BUILDDIR}"
 do_install_append_class-native () {
     oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native}
     install -d $oscapdir
     cp -a ${D}/${STAGING_DATADIR_NATIVE}/openscap $oscapdir
 }
 
+
 FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
 RDEPENDS_${PN} += "libxml2 python3-core libgcc bash"
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 341721a06..3212310fb 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 @@ 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"
-- 
cgit v1.2.3