From f642d28e48497f98868f694476fb39ff5cb30110 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 2 Jun 2022 18:24:49 +0200 Subject: [PATCH] package/network-manager: put back libuuid dependency Commit 8b47feff2ff8ac37355431cb0414822da2c87ea1 wrongly removed libuuid dependency resulting in the following build failure: checking for UUID... no configure: error: Package requirements (uuid) were not met: Package 'uuid', required by 'virtual:world', not found It should be noted that is still used in one example: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/blob/main/examples/C/glib/add-connection-gdbus.c#L17 as stated in https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/73b9883c6f30320b727a664ff2c84cc772aac94b: "We still require libuuid for building, because it is used by an example program. Maybe that should be changed, to avoid the build dependency. But that can be done at a later time." Fixes: - http://autobuild.buildroot.org/results/ac25c42d73161bf4cdfae3e53de8826f0b8dbf9c Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/network-manager/Config.in | 2 ++ package/network-manager/network-manager.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index 1370c81c9c..39114daf18 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -13,6 +13,8 @@ config BR2_PACKAGE_NETWORK_MANAGER select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBNDP + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBUUID help NetworkManager is a set of co-operative tools that make networking simple and straightforward. Whether WiFi, wired, diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 81d6eedf0f..3c39ce7d6d 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -10,7 +10,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ - host-intltool libndp + host-intltool libndp util-linux NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md NETWORK_MANAGER_CPE_ID_VENDOR = gnome