From 9947b9bc6c1f1da28441777a84d40a62f0d609dd Mon Sep 17 00:00:00 2001 From: Robert Schwebel Date: Tue, 15 Oct 2019 10:28:14 +0200 Subject: networkmanager: remove ruleset that went upstream The changes made here have been merged in ptxdist-2019.10.0, so we can remove them from the BSP. Signed-off-by: Robert Schwebel --- rules/networkmanager.in | 106 ---------------------- rules/networkmanager.make | 225 ---------------------------------------------- 2 files changed, 331 deletions(-) delete mode 100644 rules/networkmanager.in delete mode 100644 rules/networkmanager.make diff --git a/rules/networkmanager.in b/rules/networkmanager.in deleted file mode 100644 index 6c650bc..0000000 --- a/rules/networkmanager.in +++ /dev/null @@ -1,106 +0,0 @@ -## SECTION=networking - -menuconfig NETWORKMANAGER - tristate - # intltool is unconditionally requested by configure - select HOST_GLIB - select HOST_INTLTOOL - select HOST_LIBXSLT - select HOST_MESON - select LIBC_M - select LIBC_DL - select LIBC_PTHREAD - select LIBC_RT - select DBUS - select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && RUNTIME - select GLIB - select GNUTLS - select LIBCURL if NETWORKMANAGER_CONCHECK - select LIBNDP - select LIBNEWT if NETWORKMANAGER_NMTUI - select LIBUUID - select MODEMMANAGER if NETWORKMANAGER_WWAN - select PPP if NETWORKMANAGER_PPP - select PPP_PLUGINS if NETWORKMANAGER_PPP - select READLINE if NETWORKMANAGER_NMCLI - select SYSTEMD if NETWORKMANAGER_SYSTEMD_UNIT - select UDEV - select UDEV_LIBUDEV - select WPA_SUPPLICANT if NETWORKMANAGER_WIRELESS && RUNTIME - select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && RUNTIME - select ROOTFS_VAR_LIB if RUNTIME - prompt "networkmanager " - help - NetworkManager is a tool to automate network configuration as far as - possible. The project web site is here: - - http://projects.gnome.org/NetworkManager/ - - Note: on a read-only root filesystem this package still requires a - writable '/var/lib'. - -if NETWORKMANAGER - -config NETWORKMANAGER_STARTSCRIPT - depends on !INITMETHOD_SYSTEMD - bool - default y - prompt "install /etc/init.d/NetworkManager" - -config NETWORKMANAGER_NM_ONLINE - bool - prompt "install nm-online" - help - Install the 'nm-online' tool to detect online state. - -config NETWORKMANAGER_NMTUI - bool - prompt "install nmtui" - help - Build and install the 'nmtui' tool. - -config NETWORKMANAGER_SYSTEMD_UNIT - bool - default y - depends on INITMETHOD_SYSTEMD - prompt "install systemd unit files for Network Manager" - -config NETWORKMANAGER_WIRELESS - bool - prompt "enable wireless support" - -config NETWORKMANAGER_NMCLI - bool - default y - prompt "install nmcli" - help - Build and install the 'nmcli' tool. - -config NETWORKMANAGER_WWAN - bool - prompt "enable WWAN support" - help - Enable ModemManager interface support, wwan and bluetooth - plugins depend on it. - -config NETWORKMANAGER_PPP - bool - prompt "enable ppp support" - -config NETWORKMANAGER_CONCHECK - bool - prompt "enable connectivity checking support" - -config NETWORKMANAGER_EXAMPLES - bool - prompt "install examples for Network Manager" - -config NETWORKMANAGER_POLKIT - bool - default POLKIT - -endif - -menu "networkmanager plugins " -source "generated/networkmanager_plugins.in" -endmenu diff --git a/rules/networkmanager.make b/rules/networkmanager.make deleted file mode 100644 index 682764f..0000000 --- a/rules/networkmanager.make +++ /dev/null @@ -1,225 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009, 2017 by Robert Schwebel -# (C) 2012 by Jan Luebbe -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager - -# -# Paths and names -# -NETWORKMANAGER_VERSION := 1.20.0 -NETWORKMANAGER_MD5 := 109df9b0813755a98735206f5b2d68da -NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION) -NETWORKMANAGER_SUFFIX := tar.xz -NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.20/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX) -NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER) -NETWORKMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later -NETWORKMANAGER_LICENSE_FILES := file://COPYING;md5=cbbffd568227ada506640fe950a4823b - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# -# meson -# -NETWORKMANAGER_CONF_TOOL := meson -NETWORKMANAGER_CONF_OPT = \ - $(CROSS_MESON_USR) \ - -Dbluez5_dun=false \ - -Dconcheck=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_CONCHECK) \ - -Dconfig_dhcp_default=internal \ - -Dconfig_dns_rc_manager_default=file \ - -Dconfig_logging_backend_default=default \ - -Dcrypto=gnutls \ - -Ddbus_conf_dir=/usr/share/dbus-1/system.d \ - -Ddhclient=/usr/sbin/dhclient \ - -Ddhcpcanon=false \ - -Ddhcpcd=false \ - -Ddnsmasq=/usr/sbin/dnsmasq \ - -Ddnssec_trigger=/bin/true \ - -Ddocs=false \ - -Debpf=false \ - -Dhostname_persist=default \ - -Difcfg_rh=false \ - -Difupdown=true \ - -Dintrospection=false \ - -Diptables=/usr/sbin/iptables \ - -Diwd=false \ - -Djson_validation=false \ - -Dkernel_firmware_dir=/lib/firmware \ - -Dld_gc=true \ - -Dlibaudit=no \ - -Dlibpsl=false \ - -Dmodem_manager=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_WWAN) \ - -Dmodify_system=false \ - -Dmore_asserts=no \ - -Dmore_logging=false \ - -Dnetconfig=false \ - -Dnmcli=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMCLI) \ - -Dnmtui=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_NMTUI) \ - -Dofono=false \ - -Dovs=false \ - -Dpolkit=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_POLKIT) \ - -Dpolkit_agent=false \ - -Dppp=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_PPP) \ - -Dpppd=/usr/sbin/pppd \ - -Dpppd_plugin_dir=$(PPP_SHARED_INST_PATH) \ - -Dqt=false \ - -Dresolvconf=false \ - -Dselinux=false \ - -Dsession_tracking=no \ - -Dsession_tracking_consolekit=false \ - -Dsuspend_resume=$(call ptx/ifdef,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT,systemd,upower) \ - -Dsystem_ca_path=/etc/ssl/certs \ - -Dsystemd_journal=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT) \ - -Dsystemdsystemunitdir=/usr/lib/systemd/system \ - -Dteamdctl=false \ - -Dtests=no \ - -Dudev_dir=/usr/lib/udev \ - -Dvalgrind=no \ - -Dvapi=false \ - -Dwext=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_WIRELESS) \ - -Dwifi=$(call ptx/truefalse,PTXCONF_NETWORKMANAGER_WIRELESS) - -ifdef PTXCONF_NETWORKMANAGER_WWAN -NETWORKMANAGER_LDFLAGS := \ - -Wl,-rpath,/usr/lib/NetworkManager/$(NETWORKMANAGER_VERSION) -endif - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/networkmanager.install: - @$(call targetinfo) - @$(call world/install, NETWORKMANAGER) - -ifdef PTXCONF_NETWORKMANAGER_EXAMPLES - @cd $(NETWORKMANAGER_DIR)/examples/C/glib/ \ - && for FILE in `find -type f -executable -printf '%f\n'`; do \ - install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \ - done - @cd $(NETWORKMANAGER_DIR)/examples/python/dbus \ - && for FILE in `find -name "*.py" -printf '%f\n'`; do \ - install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \ - done - @cd $(NETWORKMANAGER_DIR)/examples/shell/ \ - && for FILE in `find -name "*.sh" -printf '%f\n'`; do \ - install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \ - done -endif - - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/networkmanager.targetinstall: - @$(call targetinfo) - - @$(call install_init, networkmanager) - @$(call install_fixup, networkmanager,PRIORITY,optional) - @$(call install_fixup, networkmanager,SECTION,base) - @$(call install_fixup, networkmanager,AUTHOR,"Jan Luebbe ") - @$(call install_fixup, networkmanager,DESCRIPTION, "networkmanager") - - @$(call install_alternative, networkmanager, 0, 0, 0644, /etc/NetworkManager/NetworkManager.conf) - @$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/dispatcher.d/) - @$(call install_copy, networkmanager, 0, 0, 0755, /etc/NetworkManager/system-connections/) - -# # unmanage NFS root devices - @$(call install_alternative, networkmanager, 0, 0, 0755, /usr/lib/init/nm-unmanage.sh) - - @$(call install_copy, networkmanager, 0, 0, 0755, /var/lib/NetworkManager) - -ifdef PTXCONF_INITMETHOD_BBINIT -ifdef PTXCONF_NETWORKMANAGER_STARTSCRIPT - @$(call install_alternative, networkmanager, 0, 0, 0755, /etc/init.d/NetworkManager) - -ifneq ($(call remove_quotes, $(PTXCONF_NETWORKMANAGER_BBINIT_LINK)),) - @$(call install_link, networkmanager, \ - ../init.d/NetworkManager, \ - /etc/rc.d/$(PTXCONF_NETWORKMANAGER_BBINIT_LINK)) -endif -endif -endif -ifdef PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT - @$(call install_alternative, networkmanager, 0, 0, 0644, \ - /usr/lib/systemd/system/NetworkManager.service) - @$(call install_link, networkmanager, ../NetworkManager.service, \ - /usr/lib/systemd/system/multi-user.target.wants/NetworkManager.service) - @$(call install_link, networkmanager, NetworkManager.service, \ - /usr/lib/systemd/system/dbus-org.freedesktop.NetworkManager.service) - @$(call install_alternative, networkmanager, 0, 0, 0644, \ - /usr/lib/systemd/system/NetworkManager-unmanage.service) - @$(call install_link, networkmanager, ../NetworkManager-unmanage.service, \ - /usr/lib/systemd/system/NetworkManager.service.wants/NetworkManager-unmanage.service) -ifdef PTXCONF_NETWORKMANAGER_NM_ONLINE - @$(call install_alternative, networkmanager, 0, 0, 0644, \ - /usr/lib/systemd/system/NetworkManager-wait-online.service) -endif - @$(call install_alternative, networkmanager, 0, 0, 0644, \ - /usr/lib/systemd/system/NetworkManager-dispatcher.service) - @$(call install_link, networkmanager, NetworkManager-dispatcher.service, \ - /usr/lib/systemd/system/dbus-org.freedesktop.nm-dispatcher.service) -endif - - @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/sbin/NetworkManager) -ifdef PTXCONF_NETWORKMANAGER_NM_ONLINE - @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-online) -endif -ifdef PTXCONF_NETWORKMANAGER_NMCLI - @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmcli) -endif -ifdef PTXCONF_NETWORKMANAGER_NMTUI - @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmtui) -endif - - @$(call install_tree, networkmanager, 0, 0, -, /usr/libexec/) - - @$(call install_lib, networkmanager, 0, 0, 0644, \ - NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-settings-plugin-ifupdown) -ifdef PTXCONF_NETWORKMANAGER_WIRELESS - @$(call install_lib, networkmanager, 0, 0, 0644, \ - NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-device-plugin-wifi) -endif -ifdef PTXCONF_NETWORKMANAGER_WWAN - @$(call install_lib, networkmanager, 0, 0, 0644, \ - NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-device-plugin-wwan) - @$(call install_lib, networkmanager, 0, 0, 0644, \ - NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-wwan) -endif -ifdef PTXCONF_NETWORKMANAGER_PPP - @$(call install_lib, networkmanager, 0, 0, 0644, \ - NetworkManager/$(NETWORKMANAGER_VERSION)/libnm-ppp-plugin) - @$(call install_copy, networkmanager, 0, 0, 0644, -, $(PPP_SHARED_INST_PATH)/nm-pppd-plugin.so) -endif - @$(call install_lib, networkmanager, 0, 0, 0644, libnm) - - @$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system.d/) - @$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system-services/) - -ifdef PTXCONF_NETWORKMANAGER_POLKIT - @$(call install_tree, networkmanager, 0, 0, -, /usr/share/polkit-1/actions) -endif - -ifdef PTXCONF_NETWORKMANAGER_EXAMPLES - @$(call install_glob, networkmanager, 0, 0, -, /usr/bin, */nm-*-*) -endif - - @$(call install_finish, networkmanager) - - @$(call touch) - -# vim: syntax=make -- cgit v1.2.3