Re: [ptxdist] [PATCH] lowpan-tools: replace with wpan-tools

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Sun, Dec 14, 2014 at 01:27:33PM +0100, Alexander Aring wrote:
> This patch removes the actual lowpan-tools for the 802.15.4 stack and
> replace it with the wpan-tools. The lowpan-tools are deprecated now, see
> http://www.spinics.net/lists/linux-wpan/msg01132.html for more
> information. This patch also adds a migrate functionality to replace
> LOWPAN_TOOLS with WPAN_TOOLS.
> 
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> I am not sure about the migrate functionality. Maybe this could also be
> improved because both has the substring "_TOOLS" inside. Nevertheless
> this should work.

It was not quite correct. I fixed it and it works now.

Thanks, applied.

Michael

> 
>  ...0001-izoordinator-Fixes-to-error-handling.patch |  46 --------
>  .../0002-configure.ac-check-for-python2.x.patch    |  28 -----
>  .../0003-m4-add-py_check_major_version.m4.patch    |  40 -------
>  ...c-Check-that-the-python-version-is-indeed.patch |  23 ----
>  ...t-PAN-ID-short-address-and-channel-manual.patch | 122 ---------------------
>  ...z-mac-Handle-return-code-from-set-command.patch |  39 -------
>  ...hon-is-required-only-for-the-serial-tests.patch |  63 -----------
>  patches/lowpan-tools-0.3/autogen.sh                |  11 --
>  patches/lowpan-tools-0.3/series                    |  10 --
>  rules/lowpan-tools.in                              |  21 ----
>  rules/lowpan-tools.make                            |  91 ---------------
>  rules/wpan-tools.in                                |   8 ++
>  rules/wpan-tools.make                              |  57 ++++++++++
>  scripts/migrate/migrate_ptx                        |   8 ++
>  14 files changed, 73 insertions(+), 494 deletions(-)
>  delete mode 100644 patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch
>  delete mode 100644 patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch
>  delete mode 100644 patches/lowpan-tools-0.3/0003-m4-add-py_check_major_version.m4.patch
>  delete mode 100644 patches/lowpan-tools-0.3/0004-configure.ac-Check-that-the-python-version-is-indeed.patch
>  delete mode 100644 patches/lowpan-tools-0.3/0005-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
>  delete mode 100644 patches/lowpan-tools-0.3/0006-iz-mac-Handle-return-code-from-set-command.patch
>  delete mode 100644 patches/lowpan-tools-0.3/0007-Python-is-required-only-for-the-serial-tests.patch
>  delete mode 100755 patches/lowpan-tools-0.3/autogen.sh
>  delete mode 100644 patches/lowpan-tools-0.3/series
>  delete mode 100644 rules/lowpan-tools.in
>  delete mode 100644 rules/lowpan-tools.make
>  create mode 100644 rules/wpan-tools.in
>  create mode 100644 rules/wpan-tools.make
> 
> diff --git a/patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch b/patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch
> deleted file mode 100644
> index b290bbf..0000000
> --- a/patches/lowpan-tools-0.3/0001-izoordinator-Fixes-to-error-handling.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> -From: Alan Ott <alan@signal11.us>
> -Date: Thu, 5 Apr 2012 00:22:56 -0400
> -Subject: [PATCH] izoordinator: Fixes to error handling
> -
> -Some of the error handling was checking for != 0 on functions which
> -return positive values on success.
> -
> -Signed-off-by: Alan Ott <alan@signal11.us>
> ----
> - src/coordinator.c | 9 ++++++---
> - 1 file changed, 6 insertions(+), 3 deletions(-)
> -
> -diff --git a/src/coordinator.c b/src/coordinator.c
> -index a09633a59eca..c139aae3de31 100644
> ---- a/src/coordinator.c
> -+++ b/src/coordinator.c
> -@@ -94,7 +94,8 @@ static int mlme_start(uint16_t short_addr, uint16_t pan, uint8_t channel, uint8_
> - 	nla_put_u8(msg, IEEE802154_ATTR_COORD_REALIGN, 0);
> - #endif
> - 	int err = nl_send_auto_complete(nl, msg);
> --	log_msg_nl_perror("nl_send_auto_complete", err);
> -+	if (err < 0)
> -+		log_msg_nl_perror("nl_send_auto_complete", err);
> - 	return 0;
> - }
> - 
> -@@ -129,7 +130,8 @@ static int coordinator_associate(struct genlmsghdr *ghdr, struct nlattr **attrs)
> - 
> - 	int err = nl_send_auto_complete(nl, msg);
> - 
> --	log_msg_nl_perror("nl_send_auto_complete", err);
> -+	if (err < 0)
> -+		log_msg_nl_perror("nl_send_auto_complete", err);
> - 
> - 	return 0;
> - }
> -@@ -408,7 +410,8 @@ int main(int argc, char **argv)
> - 	log_msg_nl_perror("genl_connect", err);
> - 
> - 	family = genl_ctrl_resolve(nl, IEEE802154_NL_NAME);
> --	log_msg_nl_perror("genl_ctrl_resolve", NLE_NOMEM);
> -+	if (family < 0)
> -+		log_msg_nl_perror("genl_ctrl_resolve", family);
> - 
> - 	nl_socket_add_membership(nl, nl_get_multicast_id(nl, IEEE802154_NL_NAME, IEEE802154_MCAST_COORD_NAME));
> - 
> diff --git a/patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch b/patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch
> deleted file mode 100644
> index 6c67f62..0000000
> --- a/patches/lowpan-tools-0.3/0002-configure.ac-check-for-python2.x.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Alexander Aring <alex.aring@googlemail.com>
> -Date: Fri, 21 Dec 2012 06:37:14 +0100
> -Subject: [PATCH] configure.ac: check for python2.x
> -
> -Check for python2.x at first.
> -
> -test_DQ.py works with python2.x only.
> -'make install' needs python2.x to generate *.pyc files.
> -
> -Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ----
> - configure.ac | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index c483b4ff38de..6c9f54b0ca03 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -77,6 +77,9 @@ AC_PROG_LIBTOOL
> - AM_PROG_LEX
> - AC_PROG_YACC
> - AC_SUBST(LIBTOOL_DEPS)
> -+# Currently the scripts works with python2.x only
> -+# Check for this at first
> -+AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
> - AM_PATH_PYTHON(,, [:])
> - AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
> - 
> diff --git a/patches/lowpan-tools-0.3/0003-m4-add-py_check_major_version.m4.patch b/patches/lowpan-tools-0.3/0003-m4-add-py_check_major_version.m4.patch
> deleted file mode 100644
> index 9232025..0000000
> --- a/patches/lowpan-tools-0.3/0003-m4-add-py_check_major_version.m4.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> -From: Alan Ott <alan@signal11.us>
> -Date: Sun, 17 Mar 2013 18:13:45 -0400
> -Subject: [PATCH] m4: add py_check_major_version.m4
> -
> -Macro to check the Python major version.
> -
> -This is from stackoverflow user bigleux on page:
> -  http://stackoverflow.com/questions/4619664/autofoo-test-for-maximum-version-of-python
> -
> -Signed-off-by: Alan Ott <alan@signal11.us>
> ----
> - m4/py_check_major_version.m4 | 19 +++++++++++++++++++
> - 1 file changed, 19 insertions(+)
> - create mode 100644 m4/py_check_major_version.m4
> -
> -diff --git a/m4/py_check_major_version.m4 b/m4/py_check_major_version.m4
> -new file mode 100644
> -index 000000000000..6d45be8c87a7
> ---- /dev/null
> -+++ b/m4/py_check_major_version.m4
> -@@ -0,0 +1,19 @@
> -+`# From http://stackoverflow.com/questions/4619664/autofoo-test-for-maximum-version-of-python
> -+`#      stackoverflow user biegleux
> -+
> -+`# py_CHECK_MAJOR_VERSION(VARIABLE, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE])`  
> -+`# ---------------------------------------------------------------------------`  
> -+`# Run ACTION-IF-TRUE if the VAR has a major version >= VERSION.`  
> -+`# Run ACTION-IF-FALSE otherwise.`  
> -+AC_DEFUN([py_CHECK_MAJOR_VERSION],  
> -+[AC_MSG_CHECKING([whether $1 $$1 major version == $2])  
> -+case $$1 in  
> -+$2*)  
> -+  AC_MSG_RESULT([yes])  
> -+  ifelse([$3], [$3], [:])  
> -+  ;;  
> -+*)  
> -+  AC_MSG_RESULT([no])  
> -+  ifelse([$4], , [AC_MSG_ERROR([$$1 differs from $2])], [$4])  
> -+  ;;  
> -+esac])  
> diff --git a/patches/lowpan-tools-0.3/0004-configure.ac-Check-that-the-python-version-is-indeed.patch b/patches/lowpan-tools-0.3/0004-configure.ac-Check-that-the-python-version-is-indeed.patch
> deleted file mode 100644
> index 96a6ef1..0000000
> --- a/patches/lowpan-tools-0.3/0004-configure.ac-Check-that-the-python-version-is-indeed.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Alan Ott <alan@signal11.us>
> -Date: Sun, 17 Mar 2013 18:18:46 -0400
> -Subject: [PATCH] configure.ac: Check that the python version is indeed 2
> -
> -Python 3 breaks all our scripts.
> -
> -Signed-off-by: Alan Ott <alan@signal11.us>
> ----
> - configure.ac | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 6c9f54b0ca03..89c265128fdb 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -81,6 +81,7 @@ AC_SUBST(LIBTOOL_DEPS)
> - # Check for this at first
> - AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
> - AM_PATH_PYTHON(,, [:])
> -+py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
> - AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
> - 
> - # Checks for libraries.
> diff --git a/patches/lowpan-tools-0.3/0005-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch b/patches/lowpan-tools-0.3/0005-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
> deleted file mode 100644
> index db40c17..0000000
> --- a/patches/lowpan-tools-0.3/0005-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
> +++ /dev/null
> @@ -1,122 +0,0 @@
> -From: Stefan Schmidt <stefan@datenfreihafen.org>
> -Date: Wed, 13 Mar 2013 08:25:02 +0100
> -Subject: [PATCH] Allow to set PAN ID, short address and channel manually.
> -
> -This allows setting up a network without a PAN
> -coordinator. Necessary if you want to be compatible
> -with the contiki implementation.
> -
> -Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
> ----
> - src/iz-mac.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> - 1 file changed, 91 insertions(+)
> -
> -diff --git a/src/iz-mac.c b/src/iz-mac.c
> -index 7c1e616934e9..be980d6fb3c8 100644
> ---- a/src/iz-mac.c
> -+++ b/src/iz-mac.c
> -@@ -253,6 +253,88 @@ static struct iz_cmd_event list_response_event[] = {
> - 	{},
> - };
> - 
> -+/******************/
> -+/* SET handling  */
> -+/******************/
> -+
> -+static iz_res_t set_parse(struct iz_cmd *cmd)
> -+{
> -+	cmd->flags = NLM_F_REQUEST;
> -+	return IZ_CONT_OK;
> -+}
> -+
> -+static iz_res_t set_request(struct iz_cmd *cmd, struct nl_msg *msg)
> -+{
> -+	char *dummy;
> -+	uint16_t pan_id, short_addr;
> -+	uint8_t chan;
> -+
> -+	if (!cmd->argv[1])
> -+		return IZ_STOP_ERR;
> -+	NLA_PUT_STRING(msg, IEEE802154_ATTR_DEV_NAME, cmd->argv[1]);
> -+
> -+	if (!cmd->argv[2])
> -+		return IZ_STOP_ERR;
> -+	pan_id = strtol(cmd->argv[2], &dummy, 16);
> -+	if (*dummy) {
> -+		printf("Bad PAN ID!\n");
> -+		return IZ_STOP_ERR;
> -+	}
> -+	NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_PAN_ID, pan_id);
> -+
> -+	if (!cmd->argv[3])
> -+		return IZ_STOP_ERR;
> -+	short_addr = strtol(cmd->argv[3], &dummy, 16);
> -+	if (*dummy) {
> -+		printf("Bad short address!\n");
> -+		return IZ_STOP_ERR;
> -+	}
> -+	NLA_PUT_U16(msg, IEEE802154_ATTR_COORD_SHORT_ADDR, short_addr);
> -+
> -+	if (!cmd->argv[4])
> -+		return IZ_STOP_ERR;
> -+	chan = strtol(cmd->argv[4], &dummy, 10);
> -+	if (*dummy) {
> -+		printf("Bad channel number!\n");
> -+		return IZ_STOP_ERR;
> -+	}
> -+	NLA_PUT_U8(msg, IEEE802154_ATTR_CHANNEL, chan);
> -+
> -+	/* set all unneeded attributes to 0*/
> -+	NLA_PUT_U8(msg, IEEE802154_ATTR_PAN_COORD, 0);
> -+	NLA_PUT_U8(msg, IEEE802154_ATTR_BCN_ORD, 0);
> -+	NLA_PUT_U8(msg, IEEE802154_ATTR_SF_ORD, 0);
> -+	NLA_PUT_U8(msg, IEEE802154_ATTR_BAT_EXT, 0);
> -+	NLA_PUT_U8(msg, IEEE802154_ATTR_COORD_REALIGN, 0);
> -+
> -+	return IZ_CONT_OK;
> -+
> -+nla_put_failure:
> -+	return IZ_STOP_ERR;
> -+}
> -+
> -+static iz_res_t set_response(struct iz_cmd *cmd, struct genlmsghdr *ghdr, struct nlattr **attrs)
> -+{
> -+	if (!attrs[IEEE802154_ATTR_SHORT_ADDR] ||
> -+		!attrs[IEEE802154_ATTR_STATUS] )
> -+		return IZ_STOP_ERR;
> -+
> -+	printf("Set PAN ID %04hx, short address %04hx, status %i\n",
> -+		nla_get_u16(attrs[IEEE802154_ATTR_COORD_PAN_ID]),
> -+		nla_get_u16(attrs[IEEE802154_ATTR_SHORT_ADDR]),
> -+		nla_get_u8(attrs[IEEE802154_ATTR_CHANNEL]));
> -+
> -+	return IZ_STOP_OK;
> -+}
> -+
> -+static struct iz_cmd_event set_response_event[] = {
> -+	{
> -+		.call = set_response,
> -+		.nl = IEEE802154_START_CONF,
> -+	},
> -+	{},
> -+};
> -+
> - /************************/
> - /* ASSOCIATE handling   */
> - /************************/
> -@@ -473,6 +555,15 @@ const struct iz_module iz_mac = {
> - 		.response	= list_response_event,
> - 		.finish		= list_finish,
> - 	},
> -+	{
> -+		.name           = "set",
> -+		.usage          = "<iface> <pan> <addr> <channel>",
> -+		.doc            = "Set address, channel and pan for an interface.",
> -+		.nl_cmd         = IEEE802154_START_REQ,
> -+		.parse          = set_parse,
> -+		.request        = set_request,
> -+		.response       = set_response_event,
> -+	},
> - 	{}}
> - };
> - 
> diff --git a/patches/lowpan-tools-0.3/0006-iz-mac-Handle-return-code-from-set-command.patch b/patches/lowpan-tools-0.3/0006-iz-mac-Handle-return-code-from-set-command.patch
> deleted file mode 100644
> index 9b07f8a..0000000
> --- a/patches/lowpan-tools-0.3/0006-iz-mac-Handle-return-code-from-set-command.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From: Alan Ott <alan@signal11.us>
> -Date: Sun, 17 Mar 2013 21:22:52 -0400
> -Subject: [PATCH] iz-mac: Handle return code from "set" command
> -
> -The iz set command will fail if the PAN ID is invalid. Handle this failure.
> -
> -Signed-off-by: Alan Ott <alan@signal11.us>
> ----
> - src/iz-mac.c | 16 +++++++++-------
> - 1 file changed, 9 insertions(+), 7 deletions(-)
> -
> -diff --git a/src/iz-mac.c b/src/iz-mac.c
> -index be980d6fb3c8..838229cecd77 100644
> ---- a/src/iz-mac.c
> -+++ b/src/iz-mac.c
> -@@ -315,14 +315,16 @@ nla_put_failure:
> - 
> - static iz_res_t set_response(struct iz_cmd *cmd, struct genlmsghdr *ghdr, struct nlattr **attrs)
> - {
> --	if (!attrs[IEEE802154_ATTR_SHORT_ADDR] ||
> --		!attrs[IEEE802154_ATTR_STATUS] )
> -+	uint8_t status;
> -+	
> -+	if (!attrs[IEEE802154_ATTR_STATUS])
> - 		return IZ_STOP_ERR;
> --
> --	printf("Set PAN ID %04hx, short address %04hx, status %i\n",
> --		nla_get_u16(attrs[IEEE802154_ATTR_COORD_PAN_ID]),
> --		nla_get_u16(attrs[IEEE802154_ATTR_SHORT_ADDR]),
> --		nla_get_u8(attrs[IEEE802154_ATTR_CHANNEL]));
> -+	
> -+	status = nla_get_u8(attrs[IEEE802154_ATTR_STATUS]);
> -+	if (status != 0) {
> -+		printf("Operation Failed. Check channel and PAN ID\n");
> -+		return IZ_STOP_ERR;
> -+	}
> - 
> - 	return IZ_STOP_OK;
> - }
> diff --git a/patches/lowpan-tools-0.3/0007-Python-is-required-only-for-the-serial-tests.patch b/patches/lowpan-tools-0.3/0007-Python-is-required-only-for-the-serial-tests.patch
> deleted file mode 100644
> index dc896ae..0000000
> --- a/patches/lowpan-tools-0.3/0007-Python-is-required-only-for-the-serial-tests.patch
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -From: Juergen Beisert <jbe@pengutronix.de>
> -Date: Tue, 7 Jan 2014 10:25:05 +0100
> -Subject: [PATCH] Python is required only for the serial tests
> -
> -Only the serial tests require host and target python.
> -
> -Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
> ----
> - configure.ac            | 20 +++++++++++++++-----
> - test-serial/Makefile.am |  2 ++
> - 2 files changed, 17 insertions(+), 5 deletions(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 89c265128fdb..755b39a303fe 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -19,6 +19,11 @@ AC_CONFIG_HEADER([config.h])
> - # Test for new silent rules and enable only if they are available
> - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
> - 
> -+AC_ARG_ENABLE([tests],
> -+	[AC_HELP_STRING([--disable-tests], [do not install the tests @<:@default=yes@:>@])],
> -+	[],
> -+	[enable_tests=yes])
> -+
> - AC_ARG_WITH(zbtestdir, [AC_HELP_STRING([--with-zbtestdir],
> - 	    [directory where all test programs will be installed])],
> - 	    [zbtestdir=$withval],
> -@@ -77,11 +82,16 @@ AC_PROG_LIBTOOL
> - AM_PROG_LEX
> - AC_PROG_YACC
> - AC_SUBST(LIBTOOL_DEPS)
> --# Currently the scripts works with python2.x only
> --# Check for this at first
> --AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
> --AM_PATH_PYTHON(,, [:])
> --py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
> -+
> -+if test "x$enable_tests" == "xyes" ; then
> -+	# Currently the scripts works with python2.x only
> -+	# Check for this at first
> -+	AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python)
> -+	AM_PATH_PYTHON(,, [:])
> -+	py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2])
> -+fi
> -+AM_CONDITIONAL([PYTHON_AVAILABLE], [test "x$enable_tests" == "xyes"])
> -+
> - AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
> - 
> - # Checks for libraries.
> -diff --git a/test-serial/Makefile.am b/test-serial/Makefile.am
> -index 5553ded5000a..733d47226670 100644
> ---- a/test-serial/Makefile.am
> -+++ b/test-serial/Makefile.am
> -@@ -1,6 +1,8 @@
> -+if PYTHON_AVAILABLE
> - include $(top_srcdir)/Makefile.common
> - 
> - python_PYTHON = test_DQ.py
> - tests = test_packets.py test_edscan.py test_recv.py test_trx.py
> - zbtest_SCRIPTS = $(tests)
> - EXTRA_DIST = $(tests)
> -+endif
> diff --git a/patches/lowpan-tools-0.3/autogen.sh b/patches/lowpan-tools-0.3/autogen.sh
> deleted file mode 100755
> index 354fb5f..0000000
> --- a/patches/lowpan-tools-0.3/autogen.sh
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -#! /bin/sh
> -
> -set -e
> -
> -autoreconf \
> -	--force \
> -	--install \
> -	--warnings=cross \
> -	--warnings=syntax \
> -	--warnings=obsolete \
> -	--warnings=unsupported
> diff --git a/patches/lowpan-tools-0.3/series b/patches/lowpan-tools-0.3/series
> deleted file mode 100644
> index f800554..0000000
> --- a/patches/lowpan-tools-0.3/series
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-izoordinator-Fixes-to-error-handling.patch
> -0002-configure.ac-check-for-python2.x.patch
> -0003-m4-add-py_check_major_version.m4.patch
> -0004-configure.ac-Check-that-the-python-version-is-indeed.patch
> -0005-Allow-to-set-PAN-ID-short-address-and-channel-manual.patch
> -0006-iz-mac-Handle-return-code-from-set-command.patch
> -0007-Python-is-required-only-for-the-serial-tests.patch
> -# 3441df4ef2a954879bf02b211be8aeea  - git-ptx-patches magic
> diff --git a/rules/lowpan-tools.in b/rules/lowpan-tools.in
> deleted file mode 100644
> index e23c626..0000000
> --- a/rules/lowpan-tools.in
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -## SECTION=networking
> -
> -menuconfig LOWPAN_TOOLS
> -	tristate
> -	prompt "lowpan-tools                  "
> -	select LIBNL3
> -	select PYTHON if LOWPAN_TOOLS_TESTS
> -	help
> -	  This is a set of utils to manage the Linux LoWPAN stack.
> -	  The LoWPAN stack aims for IEEE 802.15.4-2003 (and for
> -	  lesser extent IEEE 802.15.4-2006) compatibility.
> -
> -if LOWPAN_TOOLS
> -
> -config LOWPAN_TOOLS_TESTS
> -	bool
> -	prompt "lowpan-tests"
> -	help
> -	  Install lowpan-test suites in /usr/libexec/lowpan-tools.
> -
> -endif # LOWPAN_TOOLS
> diff --git a/rules/lowpan-tools.make b/rules/lowpan-tools.make
> deleted file mode 100644
> index 1ec88c5..0000000
> --- a/rules/lowpan-tools.make
> +++ /dev/null
> @@ -1,91 +0,0 @@
> -# -*-makefile-*-
> -#
> -# Copyright (C) 2012 by Alexander Aring <aar@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_LOWPAN_TOOLS) += lowpan-tools
> -
> -#
> -# Paths and names
> -#
> -LOWPAN_TOOLS_VERSION	:= 0.3
> -LOWPAN_TOOLS_MD5	:= 564bdf163de5b33232d751383495a65c
> -LOWPAN_TOOLS		:= lowpan-tools-$(LOWPAN_TOOLS_VERSION)
> -LOWPAN_TOOLS_SUFFIX	:= tar.gz
> -LOWPAN_TOOLS_URL	:= $(call ptx/mirror, SF, linux-zigbee/$(LOWPAN_TOOLS).$(LOWPAN_TOOLS_SUFFIX))
> -LOWPAN_TOOLS_SOURCE	:= $(SRCDIR)/$(LOWPAN_TOOLS).$(LOWPAN_TOOLS_SUFFIX)
> -LOWPAN_TOOLS_DIR	:= $(BUILDDIR)/$(LOWPAN_TOOLS)
> -LOWPAN_TOOLS_LICENSE	:= GPLv2
> -
> -# ----------------------------------------------------------------------------
> -# Prepare
> -# ----------------------------------------------------------------------------
> -
> -LOWPAN_TOOLS_CONF_ENV = \
> -	$(CROSS_ENV) \
> -	ac_cv_prog_YACC=: \
> -	ac_cv_prog_LEX=:
> -
> -ifdef PTXCONF_LOWPAN_TOOLS_TESTS
> -LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=$(CROSS_PYTHON)
> -else
> -LOWPAN_TOOLS_CONF_ENV += ac_cv_path_PYTHON=:
> -endif
> -
> -#
> -# autoconf
> -#
> -LOWPAN_TOOLS_CONF_TOOL	:= autoconf
> -LOWPAN_TOOLS_CONF_OPT	:= \
> -	$(CROSS_AUTOCONF_USR) \
> -	--$(call ptx/endis, PTXCONF_LOWPAN_TOOLS_TESTS)-tests \
> -	--disable-manpages \
> -	--enable-shared \
> -	--disable-static \
> -	--disable-werror \
> -	--with-gnu-ld
> -
> -LOWPAN_TOOLS_INSTALL_FILES := \
> -        gnl izlisten listen-packet test1 test2 test3 test4 test5 \
> -        test6 test7 test_edscan.py test_packets.py test_recv.py \
> -        test_trx.py
> -
> -# ----------------------------------------------------------------------------
> -# Target-Install
> -# ----------------------------------------------------------------------------
> -
> -$(STATEDIR)/lowpan-tools.targetinstall:
> -	@$(call targetinfo)
> -
> -	@$(call install_init, lowpan-tools)
> -	@$(call install_fixup, lowpan-tools,PRIORITY,optional)
> -	@$(call install_fixup, lowpan-tools,SECTION,base)
> -	@$(call install_fixup, lowpan-tools,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> -	@$(call install_fixup, lowpan-tools,DESCRIPTION,missing)
> -
> -	@$(call install_copy, lowpan-tools, 0, 0, 0755, -, /usr/bin/izchat)
> -	@$(call install_copy, lowpan-tools, 0, 0, 0755, -, /usr/sbin/iz)
> -	@$(call install_copy, lowpan-tools, 0, 0, 0755, -, /usr/sbin/izattach)
> -	@$(call install_copy, lowpan-tools, 0, 0, 0755, -, /usr/sbin/izcoordinator)
> -
> -ifdef PTXCONF_LOWPAN_TOOLS_TESTS
> -	@$(call install_copy, lowpan-tools, 0, 0, 0644, -, $(PYTHON_SITEPACKAGES)/test_DQ.pyc)
> -	
> -	@$(foreach tool,$(LOWPAN_TOOLS_INSTALL_FILES), \
> -		$(call install_copy, lowpan-tools, 0, 0, 0755, -, \
> -		/usr/libexec/lowpan-tools/$(tool));)
> -endif
> -
> -	@$(call install_finish, lowpan-tools)
> -
> -	@$(call touch)
> -
> -# vim: syntax=make
> diff --git a/rules/wpan-tools.in b/rules/wpan-tools.in
> new file mode 100644
> index 0000000..58776b0
> --- /dev/null
> +++ b/rules/wpan-tools.in
> @@ -0,0 +1,8 @@
> +## SECTION=networking
> +
> +config WPAN_TOOLS
> +	tristate
> +	prompt "wpan-tools"
> +	select LIBNL3
> +	help
> +	  Userspace tools for Linux IEEE 802.15.4 stack.
> diff --git a/rules/wpan-tools.make b/rules/wpan-tools.make
> new file mode 100644
> index 0000000..2dc27d7
> --- /dev/null
> +++ b/rules/wpan-tools.make
> @@ -0,0 +1,57 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Alexander Aring <aar@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_WPAN_TOOLS) += wpan-tools
> +
> +#
> +# Paths and names
> +#
> +WPAN_TOOLS_VERSION	:= 0.3
> +WPAN_TOOLS_MD5		:= 7b79a68b4529f6f3913f9e2ae19edb65
> +WPAN_TOOLS		:= wpan-tools-$(WPAN_TOOLS_VERSION)
> +WPAN_TOOLS_SUFFIX	:= tar.gz
> +WPAN_TOOLS_URL		:= http://wpan.cakelab.org/releases/$(WPAN_TOOLS).$(WPAN_TOOLS_SUFFIX)
> +WPAN_TOOLS_SOURCE	:= $(SRCDIR)/$(WPAN_TOOLS).$(WPAN_TOOLS_SUFFIX)
> +WPAN_TOOLS_DIR		:= $(BUILDDIR)/$(WPAN_TOOLS)
> +WPAN_TOOLS_LICENSE	:= unknown
> +
> +#
> +# autoconf
> +#
> +WPAN_TOOLS_CONF_TOOL	:= autoconf
> +WPAN_TOOLS_CONF_OPT	:= \
> +	$(CROSS_AUTOCONF_USR) \
> +	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--disable-shared \
> +	--disable-static
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/wpan-tools.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, wpan-tools)
> +	@$(call install_fixup, wpan-tools,PRIORITY,optional)
> +	@$(call install_fixup, wpan-tools,SECTION,base)
> +	@$(call install_fixup, wpan-tools,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> +	@$(call install_fixup, wpan-tools,DESCRIPTION,missing)
> +
> +	@$(call install_copy, wpan-tools, 0, 0, 0755, -, /usr/bin/iwpan)
> +
> +	@$(call install_finish, wpan-tools)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index 17449cb..cba8e2a 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -220,3 +220,11 @@ s/^\(\(# \)\?PTXCONF_GST[A-Z_]*1\)1/\1/
>  #
>  s/^# PTXCONF_LIBUSB_DISABLE_LOG.*$/PTXCONF_LIBUSB_LOG=y/
>  s/^PTXCONF_LIBUSB_DISABLE_LOG=y$/# PTXCONF_LIBUSB_LOG is not set/
> +
> +#
> +# from   : ptxdist-2014.12.0
> +# to     : ptxdist-2015.01.0
> +# symbol : LOWPAN_TOOLS	-> WPAN_TOOLS
> +# reason : userspace tool replacement
> +#
> +s/^\(\(# \)\?PTXCONF_\)_LOWPAN_TOOLS/\1_WPAN_TOOLS/
> -- 
> 2.1.3
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
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