From: Jan Luebbe <jlu@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Jan Luebbe <jlu@pengutronix.de>
Subject: [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0
Date: Thu, 31 May 2012 14:23:16 +0200 [thread overview]
Message-ID: <1338466996-10928-1-git-send-email-jlu@pengutronix.de> (raw)
Also include changes by Juergen Beisert <jbe@pengutronix.de>
to correct configure options and the missing iptables dependency.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
rules/networkmanager.in | 5 ++++-
rules/networkmanager.make | 31 ++++++++++++++++++++++++-------
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 2c08fea..0397918 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -10,10 +10,13 @@ menuconfig NETWORKMANAGER
select DBUS_GLIB
select LIBNL
select LIBUUID
- select WPA_SUPPLICANT
+ select WPA_SUPPLICANT if RUNTIME
select GNUTLS
select HOST_INTLTOOL
select DBUS_PYTHON if NETWORKMANAGER_EXAMPLES
+ select IPTABLES
+# for the 'iptables' tool
+ select IPTABLES_IPV4
prompt "networkmanager "
help
NetworkManager is a tool to automate network configuration as far as
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 32d11ed..e9b38fd 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 0.9.2.0
-NETWORKMANAGER_MD5 := d7dce01e97758253bc4ed81d7b86045f
+NETWORKMANAGER_VERSION := 0.9.4.0
+NETWORKMANAGER_MD5 := 66a54b51a4998c484613911b72a7e6ff
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
NETWORKMANAGER_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
@@ -48,7 +48,12 @@ NETWORKMANAGER_CONF_OPT := \
--without-docs \
--with-gnu-ld \
--with-crypto=gnutls \
- --with-distro=debian
+ --with-distro=debian \
+ --with-session-tracking=none \
+ --with-dhclient=/sbin/dhclient \
+ --with-dhcpcd=no \
+ --with-resolvconf=no \
+ --with-iptables=/usr/sbin/iptables
# ----------------------------------------------------------------------------
# Install
@@ -59,10 +64,16 @@ $(STATEDIR)/networkmanager.install:
@$(call world/install, NETWORKMANAGER)
ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
- @cd $(NETWORKMANAGER_DIR)/examples/C/glib/ && for FILE in `find -name "*-glib" -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_DIR)/examples/C/glib/ \
+ && for FILE in `find -name "*-glib" -printf '%f\n'`; do \
install -D -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
done
- @cd $(NETWORKMANAGER_DIR)/examples/python/ && for FILE in `find -name "*.py" -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_DIR)/examples/python/ \
+ && for FILE in `find -name "*.py" -printf '%f\n'`; do \
+ install -D -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 -D -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
done
endif
@@ -126,10 +137,16 @@ endif
@$(call install_tree, networkmanager, 0, 0, -, /usr/share/dbus-1/system-services/)
ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
- @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ && for FILE in `find -name "*-glib" -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
+ && for FILE in `find -name "*-glib" -printf '%f\n'`; do \
+ $(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
+ done
+ @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
+ && for FILE in `find -name "*.py" -printf '%f\n'`; do \
$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
done
- @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ && for FILE in `find -name "*.py" -printf '%f\n'`; do \
+ @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
+ && for FILE in `find -name "*.sh" -printf '%f\n'`; do \
$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
done
endif
--
1.7.10
--
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2012-05-31 12:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-31 12:23 Jan Luebbe [this message]
2012-05-31 13:03 ` Juergen Beisert
2012-05-31 13:11 ` Jan Lübbe
2012-05-31 13:47 ` Juergen Beisert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1338466996-10928-1-git-send-email-jlu@pengutronix.de \
--to=jlu@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox