From 36166cd035bf51c6830b977e48316d708daa62b5 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Mon, 26 Aug 2019 01:31:32 -0400
Subject: meta-security: subtree update:ecb526ffab..6d399b34ab

Armin Kuster (1):
      linux-stable: rename to more generic bbappend

Martin Jansa (1):
      smack: add runtime dependency on python3-core

Yi Zhao (2):
      openscap: fix scap-security-guide build error
      openscap: add runtime dependency on bash and python3-core

Change-Id: Ia475fd05a9f0c1f4be337ee5cf84481e3b07d50b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 .../meta-security-compliance/recipes-openscap/openscap/openscap.inc   | 3 ++-
 meta-security/recipes-kernel/linux/linux-%_5.%.bbappend               | 4 ++++
 meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend          | 4 ----
 meta-security/recipes-mac/smack/smack_1.3.1.bb                        | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 meta-security/recipes-kernel/linux/linux-%_5.%.bbappend
 delete mode 100644 meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend

(limited to 'meta-security')

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 53309e8ad..ed8d8ffa7 100644
--- a/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
+++ b/meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc
@@ -41,6 +41,7 @@ do_configure_append_class-native () {
 }
 
 do_clean[cleandirs] += "${STAGING_OSCAP_BUILDDIR}"
+do_install[nostamp] = "1"
 
 do_install_append_class-native () {
     oscapdir=${STAGING_OSCAP_BUILDDIR}/${datadir_native}
@@ -50,6 +51,6 @@ do_install_append_class-native () {
 
 FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
 
-RDEPENDS_${PN} += "libxml2 python3 libgcc"
+RDEPENDS_${PN} += "libxml2 python3-core libgcc bash"
 
 BBCLASSEXTEND = "native"
diff --git a/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend b/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend
new file mode 100644
index 000000000..76b5df55b
--- /dev/null
+++ b/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend
@@ -0,0 +1,4 @@
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}"
+KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}"
+
diff --git a/meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend b/meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend
deleted file mode 100644
index 76b5df55b..000000000
--- a/meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}"
-
diff --git a/meta-security/recipes-mac/smack/smack_1.3.1.bb b/meta-security/recipes-mac/smack/smack_1.3.1.bb
index 246562afe..f32d91ba3 100644
--- a/meta-security/recipes-mac/smack/smack_1.3.1.bb
+++ b/meta-security/recipes-mac/smack/smack_1.3.1.bb
@@ -48,7 +48,7 @@ INITSCRIPT_PARAMS = "start 16 2 3 4 5 . stop 35 0 1 6 ."
 FILES_${PN} += "${sysconfdir}/init.d/smack"
 FILES_${PN}-ptest += "generator"
 
-RDEPENDS_${PN} += "coreutils"
+RDEPENDS_${PN} += "coreutils python3-core"
 RDEPENDS_${PN}-ptest += "make bash bc"
 
 BBCLASSEXTEND = "native"
-- 
cgit v1.2.3