Signed-off-by: Juergen Borleis <[email protected]>
---
rules/networkmanager.in | 38 ++++++++++++++++++++++++++------------
rules/networkmanager.make | 36 ++++++++++++++++++++++++++----------
2 files changed, 52 insertions(+), 22 deletions(-)
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index d805d0f..2e6699e 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -2,24 +2,27 @@
menuconfig NETWORKMANAGER
tristate
+ select LIBC_M
+ select LIBC_DL
+ select LIBC_PTHREAD
+ select LIBC_RT
select DHCP if RUNTIME
- select DHCP_CLIENT
- select WIRELESS
- select WIRELESS_SHARED
- select UDEV
- select UDEV_LIBGUDEV
+ select DHCP_CLIENT if RUNTIME
+ select KERNEL_HEADER if NETWORKMANAGER_WIRELESS
+ select DBUS
select DBUS_GLIB
- select LIBNL3
+ select READLINE # for 'nmcli'
select LIBUUID
- select WPA_SUPPLICANT if RUNTIME
select GNUTLS
- select HOST_INTLTOOL
+ select LIBNL3
+ select HOST_INTLTOOL # why? NLS is disabled!!!
+ select LIBNDP
+ select UDEV if RUNTIME
+ select UDEV_LIBGUDEV
+ select WPA_SUPPLICANT if NETWORKMANAGER_WIRELESS && RUNTIME
+ select WPA_SUPPLICANT_CTRL_IFACE_DBUS
select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES && RUNTIME
- select IPTABLES if RUNTIME
-# to detect correct systemd version
select SYSTEMD if NETWORKMANAGER_SYSTEMD_UNIT
-# for the 'iptables' tool
- select IPTABLES_IPV4
prompt "networkmanager "
help
NetworkManager is a tool to automate network configuration as far as
@@ -30,16 +33,27 @@ menuconfig NETWORKMANAGER
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_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_EXAMPLES
bool
prompt "install examples for Network Manager"
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index ca7cd65..f7297e2 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 0.9.8.8
-NETWORKMANAGER_MD5 := bad2486578aa9f4d2f5c1c1446e8daf4
+NETWORKMANAGER_VERSION := 1.0.0
+NETWORKMANAGER_MD5 := 71cae8707a90fa92e28cafbc9262b548
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
-NETWORKMANAGER_URL :=
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_URL :=
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.0/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_SOURCE := $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
NETWORKMANAGER_DIR := $(BUILDDIR)/$(NETWORKMANAGER)
@@ -44,27 +44,37 @@ NETWORKMANAGER_CONF_OPT := \
--enable-ifupdown \
--disable-ifnet \
--disable-qt \
- --disable-bluez4 \
--disable-wimax \
--disable-polkit \
--disable-modify-system \
--disable-ppp \
+ --disable-bluez5-dun \
--disable-concheck \
--enable-more-warnings \
--disable-vala \
--disable-tests \
- --disable-doc \
--disable-gtk-doc \
+ --disable-gtk-doc-html \
+ --disable-gtk-doc-pdf \
+ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_WIRELESS)-wext \
--with-systemdsystemunitdir=/lib/systemd/system \
- --with-session-tracking=none \
+ --with-session-tracking=no \
+ --with-suspend-resume=systemd \
--with-crypto=gnutls \
+ --with-dbus-sys-dir=/etc/dbus-1/system.d \
--without-modem-manager-1 \
--with-dhclient=/sbin/dhclient \
--without-dhcpcd \
--without-resolvconf \
--without-netconfig \
- --with-iptables=/usr/sbin/iptables
-
+ --with-iptables=/usr/sbin/iptables \
+ --without-dnsmasq \
+ --without-system-ca-path \
+ --with-kernel-firmware-dir=/lib/firmware \
+ --without-libsoup \
+ --without-nmtui \
+ --without-valgrind \
+ --without-tests
# ----------------------------------------------------------------------------
# Install
@@ -102,7 +112,7 @@ $(STATEDIR)/networkmanager.targetinstall:
@$(call install_fixup, networkmanager,PRIORITY,optional)
@$(call install_fixup, networkmanager,SECTION,base)
@$(call install_fixup, networkmanager,AUTHOR,"Jan Luebbe
<[email protected]>")
- @$(call install_fixup, networkmanager,DESCRIPTION,missing)
+ @$(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/)
@@ -144,15 +154,21 @@ ifdef PTXCONF_NETWORKMANAGER_SYSTEMD_UNIT
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)
- @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-tool)
+endif
@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmcli)
@$(call install_tree, networkmanager, 0, 0, -, /usr/libexec/)
@$(call install_lib, networkmanager, 0, 0, 0644,
NetworkManager/libnm-settings-plugin-ifupdown)
+ifdef PTXCONF_NETWORKMANAGER_WIRELESS
+ @$(call install_lib, networkmanager, 0, 0, 0644,
NetworkManager/libnm-device-plugin-wifi)
+endif
+ @$(call install_lib, networkmanager, 0, 0, 0644, libnm)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-util)
@$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib)
+ @$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib-vpn)
@$(call install_tree, networkmanager, 0, 0, -, /etc/dbus-1/system.d/)
@$(call install_tree, networkmanager, 0, 0, -,
/usr/share/dbus-1/system-services/)
--
2.1.4
--
ptxdist mailing list
[email protected]
