diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-09 21:56:41 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-09-09 21:57:26 +0300 |
commit | 1fdf4aa48a5446689546be41e10dd0e8832605d6 (patch) | |
tree | f3f8c95aa276ac0fb150acdc7e41958b57654424 /meta-security/recipes-core/busybox | |
parent | c1d34338068e7d99e34db98597b2d8b3b58e6c2a (diff) | |
download | openbmc-1fdf4aa48a5446689546be41e10dd0e8832605d6.tar.xz |
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>
Diffstat (limited to 'meta-security/recipes-core/busybox')
-rw-r--r-- | meta-security/recipes-core/busybox/busybox_%.bbappend | 4 | ||||
-rw-r--r-- | meta-security/recipes-core/busybox/busybox_libsecomp.inc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-security/recipes-core/busybox/busybox_%.bbappend b/meta-security/recipes-core/busybox/busybox_%.bbappend index 8bb0706ec5..27a24824dc 100644 --- a/meta-security/recipes-core/busybox/busybox_%.bbappend +++ b/meta-security/recipes-core/busybox/busybox_%.bbappend @@ -1,3 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://head.cfg" +require ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'busybox_libsecomp.inc', '', d)} diff --git a/meta-security/recipes-core/busybox/busybox_libsecomp.inc b/meta-security/recipes-core/busybox/busybox_libsecomp.inc new file mode 100644 index 0000000000..4af22ce3e9 --- /dev/null +++ b/meta-security/recipes-core/busybox/busybox_libsecomp.inc @@ -0,0 +1,3 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:" + +SRC_URI_append = " file://head.cfg" |