30bf7e3f22
Commit 7643ab05de
("package/network-manager: drop obsolete dependencies") was a bit too
brutal in its dependency removal, as it forgot that removing dbus-glib
as a dependency would make libglib2 no longer part of the dependencies
of network-manager.
However, network-manager does require libglib2. From configure.ac:
PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
[AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/tap-driver.sh')
AC_SUBST(AM_TESTS_FD_REDIRECT, '--tap')],
[PKG_CHECK_MODULES(GLIB, gio-unix-2.0 >= 2.40 gmodule-2.0)
AC_SUBST(LOG_DRIVER, '$(top_srcdir)/build-aux/test-driver')])
So this commit re-adds libglib2 as a dependency, and propagates the
appropriate "depends on". Nothing selects BR2_PACKAGE_NETWORK_MANAGER,
so we don't have to propagate these additional "depends on" anywhere.
Fixes:
http://autobuild.buildroot.net/results/2025b1bd721bb5c5fa6638ccf389d2fd8fd10339/
https://bugs.busybox.net/show_bug.cgi?id=12326
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Lubomir Rintel <lkundrak@v3.sk>
Cc: Christian Stewart <christian@paral.in>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
104 lines
3.3 KiB
Makefile
104 lines
3.3 KiB
Makefile
################################################################################
|
|
#
|
|
# network-manager
|
|
#
|
|
################################################################################
|
|
|
|
NETWORK_MANAGER_VERSION_MAJOR = 1.20
|
|
NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4
|
|
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 readline libndp
|
|
# Even though the COPYING file only contains the GPL-2.0 text, many
|
|
# parts of network-manager are under LGPL-2.0. See the "Legal" section
|
|
# of the CONTRIBUTING file for details.
|
|
NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm)
|
|
NETWORK_MANAGER_LICENSE_FILES = COPYING CONTRIBUTING
|
|
|
|
NETWORK_MANAGER_CONF_ENV = \
|
|
ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
|
|
ac_cv_file__etc_fedora_release=no \
|
|
ac_cv_file__etc_mandriva_release=no \
|
|
ac_cv_file__etc_debian_version=no \
|
|
ac_cv_file__etc_redhat_release=no \
|
|
ac_cv_file__etc_SuSE_release=no
|
|
|
|
NETWORK_MANAGER_CONF_OPTS = \
|
|
--disable-tests \
|
|
--disable-qt \
|
|
--disable-more-warnings \
|
|
--with-crypto=gnutls \
|
|
--with-iptables=/usr/sbin/iptables \
|
|
--disable-ifupdown
|
|
|
|
ifeq ($(BR2_PACKAGE_OFONO),y)
|
|
NETWORK_MANAGER_DEPENDENCIES += ofono
|
|
NETWORK_MANAGER_CONF_OPTS += --with-ofono
|
|
else
|
|
NETWORK_MANAGER_CONF_OPTS += --without-ofono
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBCURL),y)
|
|
NETWORK_MANAGER_DEPENDENCIES += libcurl
|
|
NETWORK_MANAGER_CONF_OPTS += --enable-concheck
|
|
else
|
|
NETWORK_MANAGER_CONF_OPTS += --disable-concheck
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
|
|
NETWORK_MANAGER_DEPENDENCIES += newt
|
|
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
|
|
else
|
|
NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
|
|
NETWORK_MANAGER_DEPENDENCIES += pppd
|
|
NETWORK_MANAGER_CONF_OPTS += --enable-ppp
|
|
else
|
|
NETWORK_MANAGER_CONF_OPTS += --disable-ppp
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
|
|
NETWORK_MANAGER_DEPENDENCIES += modem-manager
|
|
NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1
|
|
else
|
|
NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
|
|
NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_DHCPCD),y)
|
|
NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
|
|
endif
|
|
|
|
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
|
|
NETWORK_MANAGER_CONF_OPTS += --enable-ovs
|
|
NETWORK_MANAGER_DEPENDENCIES += jansson
|
|
else
|
|
NETWORK_MANAGER_CONF_OPTS += --disable-ovs
|
|
endif
|
|
|
|
define NETWORK_MANAGER_INSTALL_INIT_SYSV
|
|
$(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager
|
|
endef
|
|
|
|
define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
|
|
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
|
|
|
ln -sf /usr/lib/systemd/system/NetworkManager.service \
|
|
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service
|
|
|
|
ln -sf /usr/lib/systemd/system/NetworkManager.service \
|
|
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service
|
|
|
|
ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \
|
|
$(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
|
|
endef
|
|
|
|
$(eval $(autotools-package))
|