NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/network-manager: migrate autotools build system to meson

Browse Source 
We need to add dbus as a build dependency since the meson build system
uses dbus pkg-config to determine install locations.

The meson build also requires mobile-broadband-info in order to get
the database pkg-config variable.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
James Hilliard 2022-03-27 11:31:37 -06:00 committed by Arnout Vandecappelle
parent 85f7d623d6
commit 58c5846631
2 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/network-manager/Config.in
View File

@ -43,6 +43,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_CLI
config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER
bool "modem-manager support" bool "modem-manager support"
select BR2_PACKAGE_MODEM_MANAGER select BR2_PACKAGE_MODEM_MANAGER
select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
help help
This option enables support for ModemManager This option enables support for ModemManager

106
package/network-manager/network-manager.mk
View File

@ -9,7 +9,7 @@ NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).4
NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_SITE = https://download.gnome.org/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_INSTALL_STAGING = YES
NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev gnutls libglib2 \ NETWORK_MANAGER_DEPENDENCIES = host-pkgconf dbus udev gnutls libglib2 \
host-intltool libndp util-linux host-intltool libndp util-linux
NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm) NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.1+ (libnm)
NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md NETWORK_MANAGER_LICENSE_FILES = COPYING COPYING.LGPL CONTRIBUTING.md
@ -17,136 +17,130 @@ NETWORK_MANAGER_CPE_ID_VENDOR = gnome
NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager NETWORK_MANAGER_CPE_ID_PRODUCT = networkmanager
NETWORK_MANAGER_SELINUX_MODULES = networkmanager NETWORK_MANAGER_SELINUX_MODULES = networkmanager
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 = \ NETWORK_MANAGER_CONF_OPTS = \
--disable-introspection \ -Dintrospection=false \
--disable-tests \ -Ddocs=false \
--disable-qt \ -Dtests=no \
--disable-more-warnings \ -Dqt=false \
--with-crypto=gnutls \ -Dcrypto=gnutls \
--with-iptables=/usr/sbin/iptables \ -Diptables=/usr/sbin/iptables \
--disable-ifupdown \ -Difupdown=false \
--without-nm-cloud-setup -Dnm_cloud_setup=false \
-Dsession_tracking_consolekit=false
ifeq ($(BR2_PACKAGE_AUDIT),y) ifeq ($(BR2_PACKAGE_AUDIT),y)
NETWORK_MANAGER_DEPENDENCIES += audit NETWORK_MANAGER_DEPENDENCIES += audit
NETWORK_MANAGER_CONF_OPTS += --with-libaudit NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=yes
else else
NETWORK_MANAGER_CONF_OPTS += --without-libaudit NETWORK_MANAGER_CONF_OPTS += -Dlibaudit=no
endif endif
ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y)
NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient NETWORK_MANAGER_CONF_OPTS += -Ddhclient=/sbin/dhclient
endif endif
ifeq ($(BR2_PACKAGE_DHCPCD),y) ifeq ($(BR2_PACKAGE_DHCPCD),y)
NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd NETWORK_MANAGER_CONF_OPTS += -Ddhcpcd=/sbin/dhcpcd
endif endif
ifeq ($(BR2_PACKAGE_IWD),y) ifeq ($(BR2_PACKAGE_IWD),y)
NETWORK_MANAGER_DEPENDENCIES += iwd NETWORK_MANAGER_DEPENDENCIES += iwd
NETWORK_MANAGER_CONF_OPTS += --with-iwd NETWORK_MANAGER_CONF_OPTS += -Diwd=true
ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y) ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT),y)
NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=wpa_supplicant NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=wpa_supplicant
else else
NETWORK_MANAGER_CONF_OPTS += --with-config-wifi-backend-default=iwd NETWORK_MANAGER_CONF_OPTS += -Dconfig_wifi_backend_default=iwd
endif endif
else else
NETWORK_MANAGER_CONF_OPTS += \ NETWORK_MANAGER_CONF_OPTS += \
--without-iwd \ -Diwd=false \
--with-config-wifi-backend-default=wpa_supplicant -Dconfig_wifi_backend_default=wpa_supplicant
endif endif
ifeq ($(BR2_PACKAGE_LIBCURL),y) ifeq ($(BR2_PACKAGE_LIBCURL),y)
NETWORK_MANAGER_DEPENDENCIES += libcurl NETWORK_MANAGER_DEPENDENCIES += libcurl
NETWORK_MANAGER_CONF_OPTS += --enable-concheck NETWORK_MANAGER_CONF_OPTS += -Dconcheck=true
else else
NETWORK_MANAGER_CONF_OPTS += --disable-concheck NETWORK_MANAGER_CONF_OPTS += -Dconcheck=false
endif endif
ifeq ($(BR2_PACKAGE_LIBPSL),y) ifeq ($(BR2_PACKAGE_LIBPSL),y)
NETWORK_MANAGER_DEPENDENCIES += libpsl NETWORK_MANAGER_DEPENDENCIES += libpsl
NETWORK_MANAGER_CONF_OPTS += --with-libpsl NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=true
else else
NETWORK_MANAGER_CONF_OPTS += --without-libpsl NETWORK_MANAGER_CONF_OPTS += -Dlibpsl=false
endif endif
ifeq ($(BR2_PACKAGE_LIBSELINUX),y) ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
NETWORK_MANAGER_DEPENDENCIES += libselinux NETWORK_MANAGER_DEPENDENCIES += libselinux
NETWORK_MANAGER_CONF_OPTS += --with-selinux NETWORK_MANAGER_CONF_OPTS += -Dselinux=true
else else
NETWORK_MANAGER_CONF_OPTS += --without-selinux NETWORK_MANAGER_CONF_OPTS += -Dselinux=false
endif endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y)
NETWORK_MANAGER_DEPENDENCIES += modem-manager NETWORK_MANAGER_DEPENDENCIES += modem-manager mobile-broadband-provider-info
NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=true
else else
NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 NETWORK_MANAGER_CONF_OPTS += -Dmodem_manager=false
endif endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y) ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
NETWORK_MANAGER_CONF_OPTS += --enable-ovs NETWORK_MANAGER_CONF_OPTS += -Dovs=true
NETWORK_MANAGER_DEPENDENCIES += jansson NETWORK_MANAGER_DEPENDENCIES += jansson
else else
NETWORK_MANAGER_CONF_OPTS += --disable-ovs NETWORK_MANAGER_CONF_OPTS += -Dovs=false
endif endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y)
NETWORK_MANAGER_DEPENDENCIES += pppd NETWORK_MANAGER_DEPENDENCIES += pppd
NETWORK_MANAGER_CONF_OPTS += --enable-ppp NETWORK_MANAGER_CONF_OPTS += -Dppp=true
else else
NETWORK_MANAGER_CONF_OPTS += --disable-ppp NETWORK_MANAGER_CONF_OPTS += -Dppp=false
endif endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
NETWORK_MANAGER_DEPENDENCIES += newt NETWORK_MANAGER_DEPENDENCIES += newt
NETWORK_MANAGER_CONF_OPTS += --with-nmtui NETWORK_MANAGER_CONF_OPTS += -Dnmtui=true
else else
NETWORK_MANAGER_CONF_OPTS += --without-nmtui NETWORK_MANAGER_CONF_OPTS += -Dnmtui=false
endif endif
ifeq ($(BR2_PACKAGE_OFONO),y) ifeq ($(BR2_PACKAGE_OFONO),y)
NETWORK_MANAGER_DEPENDENCIES += ofono NETWORK_MANAGER_DEPENDENCIES += ofono
NETWORK_MANAGER_CONF_OPTS += --with-ofono NETWORK_MANAGER_CONF_OPTS += -Dofono=true
else else
NETWORK_MANAGER_CONF_OPTS += --without-ofono NETWORK_MANAGER_CONF_OPTS += -Dofono=false
endif endif
ifeq ($(BR2_PACKAGE_SYSTEMD),y) ifeq ($(BR2_PACKAGE_SYSTEMD),y)
NETWORK_MANAGER_DEPENDENCIES += systemd NETWORK_MANAGER_DEPENDENCIES += systemd
NETWORK_MANAGER_CONF_OPTS += \ NETWORK_MANAGER_CONF_OPTS += \
--with-systemd-journal \ -Dsystemd_journal=true \
--with-config-logging-backend-default=journal \ -Dconfig_logging_backend_default=journal \
--with-session-tracking=systemd \ -Dsession_tracking=systemd \
--with-suspend-resume=systemd -Dsuspend_resume=systemd
else else
NETWORK_MANAGER_CONF_OPTS += \ NETWORK_MANAGER_CONF_OPTS += \
--without-systemd-journal \ -Dsystemd_journal=false \
--with-config-logging-backend-default=syslog \ -Dconfig_logging_backend_default=syslog \
--without-session-tracking \ -Dsession_tracking=no \
--with-suspend-resume=upower -Dsuspend_resume=upower \
-Dsystemdsystemunitdir=no
endif endif
ifeq ($(BR2_PACKAGE_POLKIT),y) ifeq ($(BR2_PACKAGE_POLKIT),y)
NETWORK_MANAGER_DEPENDENCIES += polkit NETWORK_MANAGER_DEPENDENCIES += polkit
NETWORK_MANAGER_CONF_OPTS += --enable-polkit NETWORK_MANAGER_CONF_OPTS += -Dpolkit=true
else else
NETWORK_MANAGER_CONF_OPTS += --disable-polkit NETWORK_MANAGER_CONF_OPTS += -Dpolkit=false
endif endif
ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y) ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_CLI),y)
NETWORK_MANAGER_DEPENDENCIES += readline NETWORK_MANAGER_DEPENDENCIES += readline
NETWORK_MANAGER_CONF_OPTS += --with-nmcli NETWORK_MANAGER_CONF_OPTS += -Dnmcli=true
else else
NETWORK_MANAGER_CONF_OPTS += --without-nmcli NETWORK_MANAGER_CONF_OPTS += -Dnmcli=false
endif endif
define NETWORK_MANAGER_INSTALL_INIT_SYSV define NETWORK_MANAGER_INSTALL_INIT_SYSV
@ -159,4 +153,4 @@ define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD
endef endef
$(eval $(autotools-package)) $(eval $(meson-package))