| Message ID | 20220415025224.1876125-1-tianyuanhao3@163.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/network-manager: remove invalid dependencies | expand |
On 15.04.22 04:52, TIAN Yuanhao wrote: > Dependency on libiw has been removed since 0.9.3.990 [1]. > Dependency on libgcrypt has been removed since 1.2-beta1 [2]. > Dependency on libuuid has been removed since 1.31.4-dev [3]. > > [1]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/7d0761588c2dde8816c109c38c1c94233fd74afe > [2]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b6f5f030331cc680edbe19ae322e894494d63687 > [3]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/73b9883c6f30320b727a664ff2c84cc772aac94b > > Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> Reviewed-by: Marcus Hoffmann <marcus.hoffmann@othermo.de> Tested-by: Marcus Hoffmann <marcus.hoffmann@othermo.de> > --- > package/network-manager/Config.in | 6 ------ > package/network-manager/network-manager.mk | 2 +- > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > index a48cb37b15..1370c81c9c 100644 > --- a/package/network-manager/Config.in > +++ b/package/network-manager/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_NETWORK_MANAGER > bool "network-manager" > - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > depends on !BR2_STATIC_LIBS # gnutls > depends on BR2_USE_MMU # dbus > depends on BR2_PACKAGE_HAS_UDEV > @@ -13,11 +12,6 @@ config BR2_PACKAGE_NETWORK_MANAGER > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_GNUTLS > select BR2_PACKAGE_LIBGLIB2 > - select BR2_PACKAGE_LIBGCRYPT > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > - select BR2_PACKAGE_WIRELESS_TOOLS > - select BR2_PACKAGE_WIRELESS_TOOLS_LIB > select BR2_PACKAGE_LIBNDP > help > NetworkManager is a set of co-operative tools that make > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index a90228992c..d979cfc0d7 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 \ > - libgcrypt wireless_tools util-linux host-intltool libndp > + host-intltool libndp > 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
On 15/04/2022 04:52, TIAN Yuanhao wrote: > Dependency on libiw has been removed since 0.9.3.990 [1]. > Dependency on libgcrypt has been removed since 1.2-beta1 [2]. > Dependency on libuuid has been removed since 1.31.4-dev [3]. > > [1]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/7d0761588c2dde8816c109c38c1c94233fd74afe > [2]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b6f5f030331cc680edbe19ae322e894494d63687 > [3]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/73b9883c6f30320b727a664ff2c84cc772aac94b > > Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> Applied to master, thanks. Thank you for the detailed research on when/why they were removed. Regards, Arnout > --- > package/network-manager/Config.in | 6 ------ > package/network-manager/network-manager.mk | 2 +- > 2 files changed, 1 insertion(+), 7 deletions(-) > > diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in > index a48cb37b15..1370c81c9c 100644 > --- a/package/network-manager/Config.in > +++ b/package/network-manager/Config.in > @@ -1,6 +1,5 @@ > config BR2_PACKAGE_NETWORK_MANAGER > bool "network-manager" > - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt > depends on !BR2_STATIC_LIBS # gnutls > depends on BR2_USE_MMU # dbus > depends on BR2_PACKAGE_HAS_UDEV > @@ -13,11 +12,6 @@ config BR2_PACKAGE_NETWORK_MANAGER > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_GNUTLS > select BR2_PACKAGE_LIBGLIB2 > - select BR2_PACKAGE_LIBGCRYPT > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBUUID > - select BR2_PACKAGE_WIRELESS_TOOLS > - select BR2_PACKAGE_WIRELESS_TOOLS_LIB > select BR2_PACKAGE_LIBNDP > help > NetworkManager is a set of co-operative tools that make > diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk > index a90228992c..d979cfc0d7 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 \ > - libgcrypt wireless_tools util-linux host-intltool libndp > + host-intltool libndp > 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
>>>>> "TIAN" == TIAN Yuanhao <tianyuanhao3@163.com> writes: > Dependency on libiw has been removed since 0.9.3.990 [1]. > Dependency on libgcrypt has been removed since 1.2-beta1 [2]. > Dependency on libuuid has been removed since 1.31.4-dev [3]. > [1]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/7d0761588c2dde8816c109c38c1c94233fd74afe > [2]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b6f5f030331cc680edbe19ae322e894494d63687 > [3]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/73b9883c6f30320b727a664ff2c84cc772aac94b > Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> Committed to 2022.02.x, thanks.
diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index a48cb37b15..1370c81c9c 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_NETWORK_MANAGER bool "network-manager" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_MMU # dbus depends on BR2_PACKAGE_HAS_UDEV @@ -13,11 +12,6 @@ config BR2_PACKAGE_NETWORK_MANAGER select BR2_PACKAGE_DBUS select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_WIRELESS_TOOLS - select BR2_PACKAGE_WIRELESS_TOOLS_LIB select BR2_PACKAGE_LIBNDP help NetworkManager is a set of co-operative tools that make diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index a90228992c..d979cfc0d7 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 \ - libgcrypt wireless_tools util-linux host-intltool libndp + host-intltool libndp 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
Dependency on libiw has been removed since 0.9.3.990 [1]. Dependency on libgcrypt has been removed since 1.2-beta1 [2]. Dependency on libuuid has been removed since 1.31.4-dev [3]. [1]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/7d0761588c2dde8816c109c38c1c94233fd74afe [2]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b6f5f030331cc680edbe19ae322e894494d63687 [3]: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/73b9883c6f30320b727a664ff2c84cc772aac94b Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com> --- package/network-manager/Config.in | 6 ------ package/network-manager/network-manager.mk | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)