summaryrefslogtreecommitdiff
path: root/meta-security/recipes-mac
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2019-09-01 22:21:06 +0300
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2019-09-01 22:21:07 +0300
commit49e29a10ccf9979817e7c40b903e7c7925ab2e5c (patch)
treee425e17846a1bbe48def05d872841610568584cd /meta-security/recipes-mac
parent0f291cce3faf2fd387c0db8f04bd2f9f4187f6df (diff)
downloadopenbmc-49e29a10ccf9979817e7c40b903e7c7925ab2e5c.tar.xz
meta-security: subtree update:6d399b34ab..30ea7a89dc
Adrian Bunk (2): xmlsec1: Remove, moved to meta-oe libenv-perl: Remove, moved to meta-perl Armin Kuster (3): apparmor: fix RDPENDS apparmor: update to 2.13.3 integrity-image: IMA_EVM_KEY_DIR has no affect, remove Qi.Chen@windriver.com (2): ecryptfs-utils: remove openssl PACKAGECONFIG ecryptfs-utils: fix race condition in do_install Yuan Chao (2): python-scapy: upgrade 2.4.2 -> 2.4.3 checksec: upgrade 1.11.1 -> 2.1.0 Change-Id: I888703dc3a3df6fa0da471e1d112f9d88dcdc44b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-security/recipes-mac')
-rw-r--r--meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb (renamed from meta-security/recipes-mac/AppArmor/apparmor_2.13.2.bb)10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta-security/recipes-mac/AppArmor/apparmor_2.13.2.bb b/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb
index 4eaec001e..9322018bd 100644
--- a/meta-security/recipes-mac/AppArmor/apparmor_2.13.2.bb
+++ b/meta-security/recipes-mac/AppArmor/apparmor_2.13.3.bb
@@ -24,7 +24,7 @@ SRC_URI = " \
file://run-ptest \
"
-SRCREV = "af4808b5f6b58946f5c5a4de4b77df5e0eae6ca0"
+SRCREV = "2f9d9ea7e01a115b29858455d3b1b5c6a0bab75c"
S = "${WORKDIR}/git"
PARALLEL_MAKE = ""
@@ -141,6 +141,12 @@ do_install_ptest () {
cp -rf ${B}/binutils ${t}
}
+pkg_postinst_ontarget_${PN} () {
+if [ ! -d /etc/apparmor.d/cache ] ; then
+ mkdir /etc/apparmor.d/cache
+fi
+}
+
INITSCRIPT_PACKAGES = "${PN}"
INITSCRIPT_NAME = "apparmor"
INITSCRIPT_PARAMS = "start 16 2 3 4 5 . stop 35 0 1 6 ."
@@ -155,6 +161,6 @@ FILES_${PN} += "/lib/apparmor/ ${sysconfdir}/apparmor ${PYTHON_SITEPACKAGES_DIR}
FILES_mod-${PN} = "${libdir}/apache2/modules/*"
RDEPENDS_${PN} += "bash lsb"
-RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','python','python3 python3-modules','', d)}"
+RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','python','python3-core python3-modules','', d)}"
RDEPENDS_${PN}_remove += "${@bb.utils.contains('PACKAGECONFIG','perl','','perl', d)}"
RDEPENDS_${PN}-ptest += "perl coreutils dbus-lib bash"