Skip to contentSkip to conversation

dbus-broker: remove deprecated linux-4-17 option

PATCH In review Luca Bocassi 2 participants 3 messages Jun 9, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 dbus-broker: remove deprecated linux-4-17 option

From: Luca Boccassi <[email protected]>

Removed in v29

---
 meta-oe/recipes-core/dbus/dbus-broker_29.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-core/dbus/dbus-broker_29.bb +0 -1
index 49ba16911..c59809f53 100644
@@ -29,5 +29,4 @@ 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)}"
-EXTRA_OEMESON += " -Dlinux-4-17=true"
 
Signature · 1 line
2.29.2
#1 lore raw

PATCH 2/2 dbus-broker: enforce required versions of libselinux and libaudit

From: Luca Boccassi <[email protected]>

v29 requires libselinux >= 3.2 and libaudit >= 3.0, set them as such in DEPENDS

---
 meta-oe/recipes-core/dbus/dbus-broker_29.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-core/dbus/dbus-broker_29.bb +2 -2
index c59809f53..8fcdb8c66 100644
@@ -14,8 +14,8 @@ UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases"
 inherit meson pkgconfig systemd features_check
 
 DEPENDS = "expat systemd"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}"
-DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'audit', '', d)}"
+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"
 
Signature · 1 line
2.29.2
Acked-by on v1 1/2
#2 lore raw
In reply to Luca Bocassi
Quoted 4 lines · Luca Bocassi

From: Luca Boccassi <[email protected]>

Removed in v29

I was sure to have looked for that. Looked again: The option is still there but it was turned into a noop. So

Quoted 15 lines
---
 meta-oe/recipes-core/dbus/dbus-broker_29.bb | 1 -
 1 file changed, 1 deletion(-)
meta-oe/recipes-core/dbus/dbus-broker_29.bb +0 -1
index 49ba16911..c59809f53 100644
@@ -29,5 +29,4 @@ 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)}"
-EXTRA_OEMESON += " -Dlinux-4-17=true"