* [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0
@ 2012-05-31 12:23 Jan Luebbe
2012-05-31 13:03 ` Juergen Beisert
0 siblings, 1 reply; 4+ messages in thread
From: Jan Luebbe @ 2012-05-31 12:23 UTC (permalink / raw)
To: ptxdist; +Cc: Jan Luebbe
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0
2012-05-31 12:23 [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0 Jan Luebbe
@ 2012-05-31 13:03 ` Juergen Beisert
2012-05-31 13:11 ` Jan Lübbe
0 siblings, 1 reply; 4+ messages in thread
From: Juergen Beisert @ 2012-05-31 13:03 UTC (permalink / raw)
To: ptxdist; +Cc: Jan Luebbe
Jan Luebbe wrote:
> 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
IPTABLES could also use a "if RUNTIME"?
> +# 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 \
If you enable dhclient, you also should ensure it is part of the run-time
filesystem by a "select".
> [...]
jbe
--
Pengutronix e.K. | Juergen Beisert |
Linux Solutions for Science and Industry | http://www.pengutronix.de/ |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0
2012-05-31 13:03 ` Juergen Beisert
@ 2012-05-31 13:11 ` Jan Lübbe
2012-05-31 13:47 ` Juergen Beisert
0 siblings, 1 reply; 4+ messages in thread
From: Jan Lübbe @ 2012-05-31 13:11 UTC (permalink / raw)
To: ptxdist
On Thu, 2012-05-31 at 15:03 +0200, Juergen Beisert wrote:
> Jan Luebbe wrote:
> > 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
>
> IPTABLES could also use a "if RUNTIME"?
Makes sense.
> > +# 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 \
>
> If you enable dhclient, you also should ensure it is part of the run-time
> filesystem by a "select".
This is ensured by the select on DHCP_CLIENT.
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0
2012-05-31 13:11 ` Jan Lübbe
@ 2012-05-31 13:47 ` Juergen Beisert
0 siblings, 0 replies; 4+ messages in thread
From: Juergen Beisert @ 2012-05-31 13:47 UTC (permalink / raw)
To: ptxdist; +Cc: Jan Lübbe
Jan Lübbe wrote:
> [...]
> > > --without-docs \
> > > --with-gnu-ld \
> > > --with-crypto=gnutls \
> > > - --with-distro=debian
> > > + --with-distro=debian \
> > > + --with-session-tracking=none \
> > > + --with-dhclient=/sbin/dhclient \
> >
> > If you enable dhclient, you also should ensure it is part of the run-time
> > filesystem by a "select".
>
> This is ensured by the select on DHCP_CLIENT.
Ups, wasn't visible in this patch, but in the original file. Sorry for the
noise.
jbe
--
Pengutronix e.K. | Juergen Beisert |
Linux Solutions for Science and Industry | http://www.pengutronix.de/ |
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-31 13:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-31 12:23 [ptxdist] [PATCH] networkmanager: update to release 0.9.4.0 Jan Luebbe
2012-05-31 13:03 ` Juergen Beisert
2012-05-31 13:11 ` Jan Lübbe
2012-05-31 13:47 ` Juergen Beisert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox