aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-27 14:32:18 -0500
committerScott Murray <scott.murray@konsulko.com>2020-01-27 14:51:12 -0500
commit377512d344dbdfea93060ee5c00f923c69c884b2 (patch)
tree72bfd0b1a30b1010808ca0b09748d48e96618120
parent4c67a503983f0547a8bcd253122367bec6b20982 (diff)
meta-security: disable dbus-cynara patches
Rename meta-security dbus bbappend for new 1.2.16 version, and disable the Cynara support patches until they can be updated by José Bollo. Bug-AGL: SPEC-2932 Change-Id: Ia2211ad8147381898e47392fe857278189b670d3 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--meta-security/recipes-core/dbus-cynara/dbus_1.12.10.bbappend15
-rw-r--r--meta-security/recipes-core/dbus-cynara/dbus_1.12.16.bbappend17
2 files changed, 17 insertions, 15 deletions
diff --git a/meta-security/recipes-core/dbus-cynara/dbus_1.12.10.bbappend b/meta-security/recipes-core/dbus-cynara/dbus_1.12.10.bbappend
deleted file mode 100644
index 5cbf65ef6..000000000
--- a/meta-security/recipes-core/dbus-cynara/dbus_1.12.10.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/dbus-cynara:"
-
-SRC_URI_append_class-target = "\
- file://0001-Integration-of-Cynara-asynchronous-security-checks.patch \
- file://0002-Disable-message-dispatching-when-send-rule-result-is.patch \
- file://0003-Handle-unavailability-of-policy-results-for-broadcas.patch \
- file://0004-Add-own-rule-result-unavailability-handling.patch \
- file://0005-Perform-Cynara-runtime-policy-checks-by-default.patch \
- file://0006-Fix-gcc-8-warnings.patch \
- file://0007-Fix-SIGSEGV-on-disconnections.patch \
-"
-
-DEPENDS_append_class-target = " cynara smack"
-EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynara --disable-selinux','',d)}"
-
diff --git a/meta-security/recipes-core/dbus-cynara/dbus_1.12.16.bbappend b/meta-security/recipes-core/dbus-cynara/dbus_1.12.16.bbappend
new file mode 100644
index 000000000..ce2bd0822
--- /dev/null
+++ b/meta-security/recipes-core/dbus-cynara/dbus_1.12.16.bbappend
@@ -0,0 +1,17 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/dbus-cynara:"
+
+#SRC_URI_append_class-target = "\
+# file://0001-Integration-of-Cynara-asynchronous-security-checks.patch \
+# file://0002-Disable-message-dispatching-when-send-rule-result-is.patch \
+# file://0003-Handle-unavailability-of-policy-results-for-broadcas.patch \
+# file://0004-Add-own-rule-result-unavailability-handling.patch \
+# file://0005-Perform-Cynara-runtime-policy-checks-by-default.patch \
+# file://0006-Fix-gcc-8-warnings.patch \
+# file://0007-Fix-SIGSEGV-on-disconnections.patch \
+#"
+SRC_URI_append_class-target = "\
+"
+
+#DEPENDS_append_class-target = " cynara smack"
+#EXTRA_OECONF_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES','smack','--enable-cynara --disable-selinux','',d)}"
+