From e411e04c14051753bab7fc24a8e5e2753f9d2c53 Mon Sep 17 00:00:00 2001 From: Andreas Fenkart Date: Fri, 28 Mar 2025 15:16:44 +0100 Subject: [PATCH 1/2] networkmanager: remove unnecessary typelib file location workaround. The workaround introduced in commit 63db9c0d52b08c08d7d5b4aa22d1bafdc2c9b037 is no longer needed. Typelib files are now correctly located solely within STAGING_LIBDIR_NATIVE, aligning with the intended build configuration. Removing the workaround avoids the following error during build: cp: cannot stat '.../GObject*typelib': No such file or directory Signed-off: Andreas Fenkart --- .../networkmanager/networkmanager_1.46.0.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb index 1b4003df183..e8f8540c49e 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb @@ -76,11 +76,6 @@ EXTRA_OEMESON = "\ CFLAGS:append:libc-musl = " \ -DRTLD_DEEPBIND=0 \ " -do_configure:prepend() { - cp -f ${STAGING_LIBDIR}/girepository-1.0/GObject*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ - cp -f ${STAGING_LIBDIR}/girepository-1.0/Gio*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ - cp -f ${STAGING_LIBDIR}/girepository-1.0/GModule*typelib ${STAGING_LIBDIR_NATIVE}/girepository-1.0/ -} PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ From e9852b5f27ad152268559a82191a36e6e754e129 Mon Sep 17 00:00:00 2001 From: Andreas Fenkart Date: Fri, 4 Apr 2025 17:07:48 +0200 Subject: [PATCH 2/2] networkmanager: enable vala bindings if gobject introspection is enabled when opting out from the DISTRO_FEATURE gobject-introspection-date, the build fails with error: ../NetworkManager-1.50.0/meson.build:849:4: ERROR: Assert failed: vala api require GObject introspection. Use -Dvapi=false to disable it The gobject-introspection-data feature, while ultimately added to DISTRO_FEATURES via DISTRO_FEATURE_BACKFILL, isn't available during the vala.bbclass inheritance check. This also excludes derived variables e.g. GI_DATA_ENABLED. To properly disable a DISTRO_FEATURE_BACKFILL feature, it must be included in DISTRO_FEATURE_BACKFILL_CONSIDERED, a variable that is available during the parsing phase. Similar situations have been resolved in: [openembedded-core:31daea70b18b2b2266bf94063b655aaf142a6166] librsvg: Only enable the Vala bindings if GObject Introspection is enabled PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vala', '', d)}" -- and -- [meta-openembedded:d89fc6ffbdf8f947643def51b804052bb5e7ac97 libpeas: add recipe for 2.0.5 PACKAGECONFIG ?= "python3 gjs lua51 ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection', 'vala', '', d)}" Signed-off: Andreas Fenkart --- .../networkmanager/networkmanager_1.46.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb index e8f8540c49e..8b07ce3daad 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.46.0.bb @@ -77,11 +77,12 @@ CFLAGS:append:libc-musl = " \ -DRTLD_DEEPBIND=0 \ " -PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \ +PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit ppp', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES_BACKFILL_CONSIDERED', 'gobject-introspection-data', '', 'vala', d)} \ " inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}