From 60f7f944090137274563c72396940ecdb8876229 Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Mon, 21 Oct 2024 15:16:21 +0000 Subject: [PATCH] dbus-broker: Cosmetic: Recipe style fixes Improve recipe content mostly by applying some ordering suggestions from oe-stylize.py script, and mitigate also few other minor issues. Signed-off-by: Niko Mauno Signed-off-by: Khem Raj --- meta-oe/recipes-core/dbus/dbus-broker_36.bb | 27 ++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/meta-oe/recipes-core/dbus/dbus-broker_36.bb b/meta-oe/recipes-core/dbus/dbus-broker_36.bb index 46cff86db9..f0f427ba0f 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_36.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_36.bb @@ -1,33 +1,32 @@ SUMMARY = "dbus broker" DESCRIPTION = "Drop-in replacement for dbus-daemon." - SECTION = "base" - LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" +DEPENDS = "\ + expat \ + systemd \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)} \ +" -SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" +SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/${BP}.tar.xz" SRC_URI[sha256sum] = "d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" UPSTREAM_CHECK_REGEX = "releases/tag/v(?P\d+)" +SYSTEMD_SERVICE:${PN} = "${BPN}.service" + inherit meson pkgconfig systemd features_check -DEPENDS = "expat systemd" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux (>= 3.2)', '', d)}" -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit (>= 3.0)', '', d)}" - -RDEPENDS:${PN} += "dbus-common" +EXTRA_OEMESON += "-Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" +EXTRA_OEMESON += "-Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" REQUIRED_DISTRO_FEATURES = "systemd" -SYSTEMD_SERVICE:${PN} = "${BPN}.service" +RDEPENDS:${PN} += "dbus-common" +FILES:${PN} += "${nonarch_libdir}/systemd/catalog" FILES:${PN} += "${systemd_system_unitdir}" FILES:${PN} += "${systemd_user_unitdir}" -FILES:${PN} += "${nonarch_libdir}/systemd/catalog" - -EXTRA_OEMESON += " -Dselinux=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -EXTRA_OEMESON += " -Daudit=${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'true', 'false', d)}" -