[meta-oe][PATCH 1/2] dbus-broker: remove deprecated linux-4-17 option

[meta-oe][PATCH 1/2] dbus-broker: remove deprecated linux-4-17 option

[Luca Bocassi]

From: Luca Boccassi <luca.boccassi@microsoft.com>

Removed in v29

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
 meta-oe/recipes-core/dbus/dbus-broker_29.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-core/dbus/dbus-broker_29.bb b/meta-oe/recipes-core/dbus/dbus-broker_29.bb
index 49ba16911..c59809f53 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_29.bb
+++ b/meta-oe/recipes-core/dbus/dbus-broker_29.bb
@@ -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"
 
-- 
2.29.2

[meta-oe][PATCH 2/2] dbus-broker: enforce required versions of libselinux and libaudit

[Luca Bocassi]

From: Luca Boccassi <luca.boccassi@microsoft.com>

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

Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
---
 meta-oe/recipes-core/dbus/dbus-broker_29.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-core/dbus/dbus-broker_29.bb b/meta-oe/recipes-core/dbus/dbus-broker_29.bb
index c59809f53..8fcdb8c66 100644
--- a/meta-oe/recipes-core/dbus/dbus-broker_29.bb
+++ b/meta-oe/recipes-core/dbus/dbus-broker_29.bb
@@ -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"
 
-- 
2.29.2

Re: [oe] [meta-oe][PATCH 1/2] dbus-broker: remove deprecated linux-4-17 option

[Andreas Müller]

On Wed, Jun 9, 2021 at 3:15 PM Luca Bocassi <luca.boccassi@gmail.com> wrote:
>
> From: Luca Boccassi <luca.boccassi@microsoft.com>
>
> 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

Acked-by: Andreas Müller <schnitzeltony@gmail.com>
> Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
> ---
>  meta-oe/recipes-core/dbus/dbus-broker_29.bb | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/meta-oe/recipes-core/dbus/dbus-broker_29.bb b/meta-oe/recipes-core/dbus/dbus-broker_29.bb
> index 49ba16911..c59809f53 100644
> --- a/meta-oe/recipes-core/dbus/dbus-broker_29.bb
> +++ b/meta-oe/recipes-core/dbus/dbus-broker_29.bb
> @@ -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"
>