networkmanager: update and fix Network Manager, support systemd, handle NFS root

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 59 insertions, 35 deletions

diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index e7eec7a56..d1b72e5a9 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2009 by Robert Schwebel <r.schwebel@pengutronix.de>
+#           (C) 2012 by Jan Luebbe <j.luebbe@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,57 +17,39 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
 #
 # Paths and names
 #
-NETWORKMANAGER_VERSION	:= 0.7.0
-NETWORKMANAGER_MD5	:=
+NETWORKMANAGER_VERSION	:= 0.9.2.0
+NETWORKMANAGER_MD5	:= d7dce01e97758253bc4ed81d7b86045f
 NETWORKMANAGER		:= NetworkManager-$(NETWORKMANAGER_VERSION)
-NETWORKMANAGER_SUFFIX	:= tar.gz
-NETWORKMANAGER_URL	:= http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.7/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
+NETWORKMANAGER_SUFFIX	:= tar.xz
+NETWORKMANAGER_URL	:= http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_SOURCE	:= $(SRCDIR)/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
 NETWORKMANAGER_DIR	:= $(BUILDDIR)/$(NETWORKMANAGER)
 
 # ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-$(NETWORKMANAGER_SOURCE):
-	@$(call targetinfo)
-	@$(call get, NETWORKMANAGER)
-
-# ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
 
 #
 # autoconf
 #
-NETWORKMANAGER_AUTOCONF := \
+NETWORKMANAGER_CONF_TOOL := autoconf
+NETWORKMANAGER_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
+	--disable-static \
 	--enable-shared \
-	--enable-static \
+	--disable-nls \
+	--disable-rpath \
+	--disable-qt \
+	--disable-ppp \
+	--disable-wimax \
+	--disable-polkit \
 	--enable-more-warnings \
 	--disable-gtk-doc \
-	--with-gnu-ld \
 	--without-docs \
+	--with-gnu-ld \
+	--with-crypto=gnutls \
 	--with-distro=debian
 
-#  --with-tags[=TAGS]      include additional configurations [automatic]
-#  --with-distro=DISTRO    Specify the Linux distribution to target: One of
-#                          redhat, suse, gentoo, debian, arch, slackware, paldo
-#                          or mandriva
-#  --with-crypto=nss | gnutls
-#                          Cryptography library to use for certificate and key
-#                          operations
-#  --with-dbus-sys-dir=DIR where D-BUS system.d directory is
-#  --with-pppd-plugin-dir=DIR
-#                          path to the pppd plugins directory
-#  --with-dhcp-client=dhcpcd|dhclient
-#                          path to the chosen dhcp client
-#  --with-resolvconf=yes|no|path
-#                          Enable resolvconf support
-#  --with-system-ca-path=/path/to/ssl/certs
-#                          path to system CA certificates
-#  --with-html-dir=PATH    path to installed docs
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -77,10 +60,51 @@ $(STATEDIR)/networkmanager.targetinstall:
 	@$(call install_init, networkmanager)
 	@$(call install_fixup, networkmanager,PRIORITY,optional)
 	@$(call install_fixup, networkmanager,SECTION,base)
-	@$(call install_fixup, networkmanager,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
+	@$(call install_fixup, networkmanager,AUTHOR,"Jan Luebbe <j.luebbe@pengutronix.de>")
 	@$(call install_fixup, networkmanager,DESCRIPTION,missing)
 
-	@$(call install_copy, networkmanager, 0, 0, 0755, $(NETWORKMANAGER_DIR)/foobar, /dev/null)
+	@$(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, /lib/init/nm-unmanage.sh)
+
+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, \
+		/lib/systemd/system/NetworkManager.service)
+	@$(call install_link, networkmanager, ../NetworkManager.service, \
+		/lib/systemd/system/multi-user.target.wants/NetworkManager.service)
+	@$(call install_alternative, networkmanager, 0, 0, 0644, \
+		/lib/systemd/system/NetworkManager-unmanage.service)
+	@$(call install_link, networkmanager, ../NetworkManager-unmanage.service, \
+		/lib/systemd/system/NetworkManager.service.wants/NetworkManager-unmanage.service)
+endif
+
+	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/sbin/NetworkManager)
+	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-online)
+	@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-tool)
+	@$(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)
+	@$(call install_lib, networkmanager, 0, 0, 0644, libnm-util)
+	@$(call install_lib, networkmanager, 0, 0, 0644, libnm-glib)
+
+	@$(call install_tree, networkmanager, 0, 0, -, /etc/dbus-1/system.d/)
+	@$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system-services/)
 
 	@$(call install_finish, networkmanager)