From f896bb055edb01931e4e3b79360aae86d7abb6b0 Mon Sep 17 00:00:00 2001 From: José Bollo Date: Tue, 13 Aug 2019 14:39:15 +0200 Subject: dbus-cynara: Simplifies build recipe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Simplifies the way of building dbus-cynara by removing the specific recipes in favour of a recipe for dbus that handles the class-target build feature. It requires to remove fake dependencies of cynara. This is a suggestion of Tom Rini. Bug-AGL: SPEC-1839 Change-Id: Id7a736eb4b73cdb679fa9dde30e9ad8e56c2894e Signed-off-by: José Bollo --- .../dbus-cynara/dbus-cynara_1.12.10.bb | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 meta-security/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb (limited to 'meta-security/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb') diff --git a/meta-security/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb b/meta-security/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb deleted file mode 100644 index c54c594be..000000000 --- a/meta-security/recipes-core/dbus-cynara/dbus-cynara_1.12.10.bb +++ /dev/null @@ -1,42 +0,0 @@ -require ${COREBASE}/meta/recipes-core/dbus/dbus_1.12.10.bb - -FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-core/dbus/dbus:${THISDIR}/dbus-cynara:" -S = "${WORKDIR}/dbus-${PV}" - -SRC_URI_append = "\ - 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 \ -" - -DEPENDS += "cynara smack" -RDEPENDS_${PN} += "dbus" - -EXTRA_OECONF += "--enable-cynara --disable-selinux" - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES += "smack" - -# Only the main package gets created here, everything else remains in the -# normal dbus recipe. -do_install_append () { - for i in ${@' '.join([d.getVar('D', True) + x for x in (' '.join([d.getVar('FILES_${PN}-' + p, True) or '' for p in ['lib', 'dev', 'staticdev', 'doc', 'locale', 'ptest']])).split()])}; do - rm -rf $i - done - - # Try to remove empty directories, starting with the - # longest path (= deepest directory) first. - # Find needs a valid current directory. Somehow the directory - # we get called in is gone by the time that we get invoked. - ( cd ${D} - for i in `find . -type d | sort -r`; do - rmdir $i || true - done - ) -} - -# Avoid warning about dbus and dbus-cynara providing dbus-x11. -RPROVIDES_${PN}_remove = "${OLDPKGNAME}" -- cgit 1.2.3-korg