diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-08-26 08:31:32 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-08-26 08:31:33 +0300 |
| commit | 36166cd035bf51c6830b977e48316d708daa62b5 (patch) | |
| tree | 8043c76f76616bf350d341946aa153bbbde04fa8 /meta-security | |
| parent | d38c641d2eb1af993b3dbdb29d2614c35423afef (diff) | |
| download | openbmc-36166cd035bf51c6830b977e48316d708daa62b5.tar.xz | |
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>
Diffstat (limited to 'meta-security')
| -rw-r--r-- | meta-security/meta-security-compliance/recipes-openscap/openscap/openscap.inc | 3 | ||||
| -rw-r--r-- | meta-security/recipes-kernel/linux/linux-%_5.%.bbappend (renamed from meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend) | 0 | ||||
| -rw-r--r-- | meta-security/recipes-mac/smack/smack_1.3.1.bb | 2 |
3 files changed, 3 insertions, 2 deletions
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-stable_5.2.bbappend b/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend index 76b5df55b..76b5df55b 100644 --- a/meta-security/recipes-kernel/linux/linux-stable_5.2.bbappend +++ b/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend 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" |