* [ptxdist] [PATCH 1/4] libndp: add library for Neighbor Discovery Protocol
2015-02-20 9:18 [ptxdist] [RFC] update NetworkManager Juergen Borleis
@ 2015-02-20 9:19 ` Juergen Borleis
2015-02-20 9:19 ` [ptxdist] [PATCH 2/4] NetworkManager: update package Juergen Borleis
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Juergen Borleis @ 2015-02-20 9:19 UTC (permalink / raw)
To: ptxdist
Add new package required by the new NetworkManager
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
rules/libndp.in | 19 ++++++++++++++++++
rules/libndp.make | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+)
create mode 100644 rules/libndp.in
create mode 100644 rules/libndp.make
diff --git a/rules/libndp.in b/rules/libndp.in
new file mode 100644
index 0000000..e25d58c
--- /dev/null
+++ b/rules/libndp.in
@@ -0,0 +1,19 @@
+## SECTION=system_libraries
+
+menuconfig LIBNDP
+ tristate
+ prompt "libndp "
+ help
+ The libndp package provides a wrapper for IPv6 Neighbor Discovery
+ Protocol. It also provides a tool named ndptool for sending and
+ receiving NDP messages
+
+if LIBNDP
+
+config LIBNDP_NDPTOOL
+ bool
+ prompt "install 'npdtool'"
+ help
+ Install the npdtool into the root filesystem
+
+endif
diff --git a/rules/libndp.make b/rules/libndp.make
new file mode 100644
index 0000000..3ecdc71
--- /dev/null
+++ b/rules/libndp.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Juergen Borleis <jbe@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBNDP) += libndp
+
+#
+# Paths and names
+#
+LIBNDP_VERSION := 1.4
+LIBNDP_MD5 := 52c708d4b8729ae6e3781b3737a85e16
+LIBNDP := libndp-$(LIBNDP_VERSION)
+LIBNDP_SUFFIX := tar.gz
+LIBNDP_URL := http://libndp.org/files/$(LIBNDP).$(LIBNDP_SUFFIX)
+LIBNDP_SOURCE := $(SRCDIR)/$(LIBNDP).$(LIBNDP_SUFFIX)
+LIBNDP_DIR := $(BUILDDIR)/$(LIBNDP)
+LIBNDP_LICENSE := LGPLv2.1
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBNDP_CONF_TOOL := autoconf
+LIBNDP_CONF_OPT := $(CROSS_AUTOCONF_USR) \
+ --enable-shared \
+ --disable-static \
+ --disable-logging \
+ --disable-debug
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libndp.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libndp)
+ @$(call install_fixup, libndp,PRIORITY,optional)
+ @$(call install_fixup, libndp,SECTION,base)
+ @$(call install_fixup, libndp,AUTHOR,"Juergen Borleis <jbe@pengutronix.de>")
+ @$(call install_fixup, libndp,DESCRIPTION,"Neighbor Discovery Protocol support")
+
+ @$(call install_lib, libndp, 0, 0, 0644, libndp)
+ifdef PTXCONF_LIBNDP_NDPTOOL
+ @$(call install_copy, libndp, 0, 0, 0755, -, /usr/bin/ndptool)
+endif
+ @$(call install_finish, libndp)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 2/4] NetworkManager: update package
2015-02-20 9:18 [ptxdist] [RFC] update NetworkManager Juergen Borleis
2015-02-20 9:19 ` [ptxdist] [PATCH 1/4] libndp: add library for Neighbor Discovery Protocol Juergen Borleis
@ 2015-02-20 9:19 ` Juergen Borleis
2015-02-20 9:19 ` [ptxdist] [PATCH 3/4] libnewt: windowing toolkit Juergen Borleis
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Juergen Borleis @ 2015-02-20 9:19 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
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 <j.luebbe@pengutronix.de>")
- @$(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
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 3/4] libnewt: windowing toolkit
2015-02-20 9:18 [ptxdist] [RFC] update NetworkManager Juergen Borleis
2015-02-20 9:19 ` [ptxdist] [PATCH 1/4] libndp: add library for Neighbor Discovery Protocol Juergen Borleis
2015-02-20 9:19 ` [ptxdist] [PATCH 2/4] NetworkManager: update package Juergen Borleis
@ 2015-02-20 9:19 ` Juergen Borleis
2015-02-20 9:19 ` [ptxdist] [PATCH 4/4] NetworkManager: add nmtui support Juergen Borleis
2015-03-18 10:20 ` [ptxdist] [RFC] update NetworkManager Michael Olbrich
4 siblings, 0 replies; 6+ messages in thread
From: Juergen Borleis @ 2015-02-20 9:19 UTC (permalink / raw)
To: ptxdist
Add new package required by the new NetworkManager for its 'nmtui' tool
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
.../0001-Never-include-host-paths.patch | 22 ++++++++
patches/newt-0.52.18/series | 4 ++
rules/libnewt.in | 13 +++++
rules/libnewt.make | 58 ++++++++++++++++++++++
4 files changed, 97 insertions(+)
create mode 100644 patches/newt-0.52.18/0001-Never-include-host-paths.patch
create mode 100644 patches/newt-0.52.18/series
create mode 100644 rules/libnewt.in
create mode 100644 rules/libnewt.make
diff --git a/patches/newt-0.52.18/0001-Never-include-host-paths.patch b/patches/newt-0.52.18/0001-Never-include-host-paths.patch
new file mode 100644
index 0000000..f980159
--- /dev/null
+++ b/patches/newt-0.52.18/0001-Never-include-host-paths.patch
@@ -0,0 +1,22 @@
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Thu, 19 Feb 2015 16:17:48 +0100
+Subject: [PATCH] Never include host paths
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 798920313a30..2f9841643060 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -5,7 +5,7 @@ CC = @CC@
+ CPP = @CPP@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@
++CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@
+ GNU_LD = @GNU_LD@
+
+ VERSION = @VERSION@
diff --git a/patches/newt-0.52.18/series b/patches/newt-0.52.18/series
new file mode 100644
index 0000000..b5c04db
--- /dev/null
+++ b/patches/newt-0.52.18/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Never-include-host-paths.patch
+# a650892b08bf3549a7977ad5d9fe4a0d - git-ptx-patches magic
diff --git a/rules/libnewt.in b/rules/libnewt.in
new file mode 100644
index 0000000..7b6508b
--- /dev/null
+++ b/rules/libnewt.in
@@ -0,0 +1,13 @@
+## SECTION=system_libraries
+
+config LIBNEWT
+ tristate
+ select SLANG
+ select LIBPOPT
+ prompt "libnewt"
+ help
+ Newt is a programming library for color text mode, widget based user
+ interfaces. Newt can be used to add stacked windows, entry widgets,
+ checkboxes, radio buttons, labels, plain text fields, scrollbars,
+ etc., to text mode user interfaces. Newt is based on the slang
+ library.
diff --git a/rules/libnewt.make b/rules/libnewt.make
new file mode 100644
index 0000000..8289f2c
--- /dev/null
+++ b/rules/libnewt.make
@@ -0,0 +1,58 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2015 by Juergen Borleis <jbe@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBNEWT) += libnewt
+
+#
+# Paths and names
+#
+LIBNEWT_VERSION := 0.52.18
+LIBNEWT_MD5 := 685721bee1a318570704b19dcf31d268
+LIBNEWT := newt-$(LIBNEWT_VERSION)
+LIBNEWT_SUFFIX := tar.gz
+LIBNEWT_URL := https://fedorahosted.org/releases/n/e/newt/$(LIBNEWT).$(LIBNEWT_SUFFIX)
+LIBNEWT_SOURCE := $(SRCDIR)/$(LIBNEWT).$(LIBNEWT_SUFFIX)
+LIBNEWT_DIR := $(BUILDDIR)/$(LIBNEWT)
+LIBNEWT_LICENSE := GPLv2
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBNEWT_CONF_TOOL := autoconf
+LIBNEWT_CONF_OPT := $(CROSS_AUTOCONF_USR) \
+ --disable-nls \
+ --without-python \
+ --without-tcl \
+ --without-gpm-support
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libnewt.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, libnewt)
+ @$(call install_fixup, libnewt,PRIORITY,optional)
+ @$(call install_fixup, libnewt,SECTION,base)
+ @$(call install_fixup, libnewt,AUTHOR,"Juergen Borleis <jbe@pengutronix.de>")
+ @$(call install_fixup, libnewt,DESCRIPTION,"Not Eriks Windowing Toolkit")
+
+ @$(call install_lib, libnewt, 0, 0, 0644, libnewt)
+
+ @$(call install_finish, libnewt)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH 4/4] NetworkManager: add nmtui support
2015-02-20 9:18 [ptxdist] [RFC] update NetworkManager Juergen Borleis
` (2 preceding siblings ...)
2015-02-20 9:19 ` [ptxdist] [PATCH 3/4] libnewt: windowing toolkit Juergen Borleis
@ 2015-02-20 9:19 ` Juergen Borleis
2015-03-18 10:20 ` [ptxdist] [RFC] update NetworkManager Michael Olbrich
4 siblings, 0 replies; 6+ messages in thread
From: Juergen Borleis @ 2015-02-20 9:19 UTC (permalink / raw)
To: ptxdist
WIP: doesn't work yet.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
---
rules/networkmanager.in | 8 ++++++++
rules/networkmanager.make | 5 ++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 2e6699e..bb7707c 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -9,6 +9,8 @@ menuconfig NETWORKMANAGER
select DHCP if RUNTIME
select DHCP_CLIENT if RUNTIME
select KERNEL_HEADER if NETWORKMANAGER_WIRELESS
+ select NCURSES if NETWORKMANAGER_NMTUI
+ select LIBNEWT if NETWORKMANAGER_NMTUI
select DBUS
select DBUS_GLIB
select READLINE # for 'nmcli'
@@ -44,6 +46,12 @@ config NETWORKMANAGER_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
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index f7297e2..c47dd35 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -72,7 +72,7 @@ NETWORKMANAGER_CONF_OPT := \
--without-system-ca-path \
--with-kernel-firmware-dir=/lib/firmware \
--without-libsoup \
- --without-nmtui \
+ --$(call ptx/wwo,PTXCONF_NETWORKMANAGER_NMTUI)-nmtui \
--without-valgrind \
--without-tests
@@ -158,6 +158,9 @@ ifdef PTXCONF_NETWORKMANAGER_NM_ONLINE
@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nm-online)
endif
@$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmcli)
+ifdef PTXCONF_NETWORKMANAGER_NMTUI
+ @$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/nmtui)
+endif
@$(call install_tree, networkmanager, 0, 0, -, /usr/libexec/)
--
2.1.4
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [RFC] update NetworkManager
2015-02-20 9:18 [ptxdist] [RFC] update NetworkManager Juergen Borleis
` (3 preceding siblings ...)
2015-02-20 9:19 ` [ptxdist] [PATCH 4/4] NetworkManager: add nmtui support Juergen Borleis
@ 2015-03-18 10:20 ` Michael Olbrich
4 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2015-03-18 10:20 UTC (permalink / raw)
To: ptxdist
On Fri, Feb 20, 2015 at 10:18:59AM +0100, Juergen Borleis wrote:
> The following patch series tries to update the NetworkManager package. "Try"
> because I'm not sure if the dependencies are set correctly. For example the
> "HOST_INTLTOOL" dependency looks strange. I'm also not sure if and why there
> was a run-time dependency to "IPTABLES" and "IPTABLES_IPV4". How is
> NetworkManager using these tools?
>
> It seems the "nmtui" coming with NetworkManager is a nice tool but on my
> target it runs but I cannot use it because it does not interact with my
> keystrokes. So I kept its support in a separate patch. Any idea what's
> missing?
>
> Beside that the libnewt (used by nmtui) fails with this strange behaviour:
>
...]
I fixed this. All patches applied with small changes.
Michael
--
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] 6+ messages in thread