From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 1/2] unstrung: initial commit
Date: Wed, 27 Apr 2016 15:02:52 +0200 [thread overview]
Message-ID: <20160427130252.GC30012@pengutronix.de> (raw)
In-Reply-To: <1461668446-10703-1-git-send-email-aar@pengutronix.de>
On Tue, Apr 26, 2016 at 01:00:45PM +0200, Alexander Aring wrote:
> Cc: Michael Richardson <mcr@sandelman.ca>
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
> ---
> ...kefile-remove-twice-DESTDIR-for-man-pages.patch | 27 +++++++++
> .../0002-main-interface-needs-argument.patch | 24 ++++++++
> .../0003-main-remove-double-dagid-entry.patch | 21 +++++++
> .../0004-man-reorder-sunshine-arguments.patch | 67 ++++++++++++++++++++++
Not really relevant for ptxdist.
> .../0005-Makefile-replace-arch-with-uname-m.patch | 37 ++++++++++++
What's the upstream status of those patches?
> patches/unstrung-1.11.0/series | 8 +++
> rules/unstrung.in | 26 +++++++++
> rules/unstrung.make | 63 ++++++++++++++++++++
> 8 files changed, 273 insertions(+)
> create mode 100644 patches/unstrung-1.11.0/0001-Makefile-remove-twice-DESTDIR-for-man-pages.patch
> create mode 100644 patches/unstrung-1.11.0/0002-main-interface-needs-argument.patch
> create mode 100644 patches/unstrung-1.11.0/0003-main-remove-double-dagid-entry.patch
> create mode 100644 patches/unstrung-1.11.0/0004-man-reorder-sunshine-arguments.patch
> create mode 100644 patches/unstrung-1.11.0/0005-Makefile-replace-arch-with-uname-m.patch
> create mode 100644 patches/unstrung-1.11.0/series
> create mode 100644 rules/unstrung.in
> create mode 100644 rules/unstrung.make
>
> diff --git a/patches/unstrung-1.11.0/0001-Makefile-remove-twice-DESTDIR-for-man-pages.patch b/patches/unstrung-1.11.0/0001-Makefile-remove-twice-DESTDIR-for-man-pages.patch
> new file mode 100644
> index 0000000..f27a72d
> --- /dev/null
> +++ b/patches/unstrung-1.11.0/0001-Makefile-remove-twice-DESTDIR-for-man-pages.patch
> @@ -0,0 +1,27 @@
> +From: Alexander Aring <aar@pengutronix.de>
> +Date: Mon, 25 Apr 2016 14:23:33 +0200
> +Subject: [PATCH] Makefile: remove twice DESTDIR for man pages
> +
> +The DESTDIR will be appended in install rules of
> +"programs/Makefile.program" by using MANDIR# declartions which use
> +MANTREE. This patch removes the DESTDIR from MANTREE, otherwise the
> +there is some kind of $(DESTDIR)/$(DESTIR) behaviour.
> +
> +Signed-off-by: Alexander Aring <aar@pengutronix.de>
> +---
> + Makefile.inc | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.inc b/Makefile.inc
> +index 156c3554b5fd..3d5bfd9429a9 100644
> +--- a/Makefile.inc
> ++++ b/Makefile.inc
> +@@ -14,7 +14,7 @@ HOSTFLAGS=-m32
> + USE_OBJDIR?=false
> + XMLTO=xmlto
> +
> +-MANTREE=${DESTDIR}/usr/share/man
> ++MANTREE=/usr/share/man
> + INSTALL=install
> + INSTMANFLAGS=-D
> + INSTBINFLAGS=-D
> diff --git a/patches/unstrung-1.11.0/0002-main-interface-needs-argument.patch b/patches/unstrung-1.11.0/0002-main-interface-needs-argument.patch
> new file mode 100644
> index 0000000..33022ea
> --- /dev/null
> +++ b/patches/unstrung-1.11.0/0002-main-interface-needs-argument.patch
> @@ -0,0 +1,24 @@
> +From: Alexander Aring <aar@pengutronix.de>
> +Date: Tue, 26 Apr 2016 11:25:24 +0200
> +Subject: [PATCH] main: interface needs argument
> +
> +The interface argument needs an argument otherwise optarg is NULL.
> +
> +Signed-off-by: Alexander Aring <aar@pengutronix.de>
> +---
> + programs/sunshine/main.cpp | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/programs/sunshine/main.cpp b/programs/sunshine/main.cpp
> +index 2128eb616fac..b005ccf42fd9 100644
> +--- a/programs/sunshine/main.cpp
> ++++ b/programs/sunshine/main.cpp
> +@@ -34,7 +34,7 @@ char *progname;
> + static struct option const longopts[] =
> + {
> + { "help", 0, 0, '?'},
> +- { "interface", 0, 0, 'i'},
> ++ { "interface", 1, 0, 'i'},
> + { "daemon", 0, 0, 'D'},
> + { "prefix", 1, NULL, 'p'},
> + { "ignore-pio",0, NULL, 'P'},
> diff --git a/patches/unstrung-1.11.0/0003-main-remove-double-dagid-entry.patch b/patches/unstrung-1.11.0/0003-main-remove-double-dagid-entry.patch
> new file mode 100644
> index 0000000..802b7ea
> --- /dev/null
> +++ b/patches/unstrung-1.11.0/0003-main-remove-double-dagid-entry.patch
> @@ -0,0 +1,21 @@
> +From: Alexander Aring <aar@pengutronix.de>
> +Date: Tue, 26 Apr 2016 11:25:44 +0200
> +Subject: [PATCH] main: remove double dagid entry
> +
> +Signed-off-by: Alexander Aring <aar@pengutronix.de>
> +---
> + programs/sunshine/main.cpp | 1 -
> + 1 file changed, 1 deletion(-)
> +
> +diff --git a/programs/sunshine/main.cpp b/programs/sunshine/main.cpp
> +index b005ccf42fd9..98911c888ade 100644
> +--- a/programs/sunshine/main.cpp
> ++++ b/programs/sunshine/main.cpp
> +@@ -47,7 +47,6 @@ static struct option const longopts[] =
> + { "sleep", 1, NULL, OPTION_SLEEP},
> + { "interval", 1, NULL, 'W'},
> + { "dagid", 1, NULL, 'G'},
> +- { "dagid", 1, NULL, 'G'},
> + { "rank", 1, NULL, 'R'},
> + { "kill", 0, 0, 'K'},
> + { "verbose", 0, 0, 'v'},
> diff --git a/patches/unstrung-1.11.0/0004-man-reorder-sunshine-arguments.patch b/patches/unstrung-1.11.0/0004-man-reorder-sunshine-arguments.patch
> new file mode 100644
> index 0000000..f27e7ee
> --- /dev/null
> +++ b/patches/unstrung-1.11.0/0004-man-reorder-sunshine-arguments.patch
> @@ -0,0 +1,67 @@
> +From: Alexander Aring <aar@pengutronix.de>
> +Date: Tue, 26 Apr 2016 11:28:47 +0200
> +Subject: [PATCH] man: reorder sunshine arguments
> +
> +Interface need to be before prefix argument, the example did not work
> +for me out of box. I change the order now that all example has a prefix
> +of "--dagid xxx --interface xxx".
> +
> +Signed-off-by: Alexander Aring <aar@pengutronix.de>
> +---
> + programs/sunshine/sunshine.8 | 8 ++++----
> + programs/sunshine/sunshine.8.xml | 8 ++++----
> + 2 files changed, 8 insertions(+), 8 deletions(-)
> +
> +diff --git a/programs/sunshine/sunshine.8 b/programs/sunshine/sunshine.8
> +index 62ee52444c8b..8fb2099dca73 100644
> +--- a/programs/sunshine/sunshine.8
> ++++ b/programs/sunshine/sunshine.8
> +@@ -1,13 +1,13 @@
> + '\" t
> + .\" Title: sunshine
> + .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
> +-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
> +-.\" Date: 10/06/2015
> ++.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
> ++.\" Date: 04/26/2016
> + .\" Manual: [FIXME: manual]
> + .\" Source: [FIXME: source]
> + .\" Language: English
> + .\"
> +-.TH "SUNSHINE" "8" "10/06/2015" "[FIXME: source]" "[FIXME: manual]"
> ++.TH "SUNSHINE" "8" "04/26/2016" "[FIXME: source]" "[FIXME: manual]"
> + .\" -----------------------------------------------------------------
> + .\" * Define some portability stuff
> + .\" -----------------------------------------------------------------
> +@@ -34,7 +34,7 @@ sunshine \- light up RPL DAG
> + \fBsunshine\fR interface [\fIwlan0\fR] dagid [\fI0xabcd1234abcd1234\fR] prefix [\fIfd01:abcd::/32\fR] rank [\fI1\fR] instanceid [\fI1\fR] interval [\fI20000\fR] ignore\-pio dao\-if\-filter [\fIacp*\fR] dao\-addr\-filter [\fIfd01::/16\fR] syslog stderr
> + .SH "EXAMPLES"
> + .HP \w'\fBsunshine\fR\ 'u
> +-\fBsunshine\fR \-\-dagid \fIfunfun0\fR \-\-rank \fI1\fR \-\-prefix \fI2001:db8:0001::/48\fR \-\-interface \fIeth1\fR \-\-interval \fI30000\fR \-\-timelog \-\-verbose
> ++\fBsunshine\fR \-\-dagid \fIfunfun0\fR \-\-interface \fIeth1\fR \-\-prefix \fI2001:db8:0001::/48\fR \-\-interval \fI30000\fR \-\-rank \fI1\fR \-\-timelog \-\-verbose
> + .HP \w'\fBsunshine\fR\ 'u
> + \fBsunshine\fR \-\-dagid \fIfunfun0\fR \-\-interface \fIeth0\fR \-\-interval \fI60000\fR \-\-timelog \-\-verbose
> + .HP \w'\fBsunshine\fR\ 'u
> +diff --git a/programs/sunshine/sunshine.8.xml b/programs/sunshine/sunshine.8.xml
> +index 5c12020df8b8..4051f3fd9fcb 100644
> +--- a/programs/sunshine/sunshine.8.xml
> ++++ b/programs/sunshine/sunshine.8.xml
> +@@ -43,14 +43,14 @@
> + <command>sunshine</command>
> + <arg choice='plain'> --dagid </arg>
> + <arg choice='plain'><replaceable>funfun0</replaceable></arg>
> +- <arg choice='plain'> --rank </arg>
> +- <arg choice='plain'><replaceable>1</replaceable></arg>
> +- <arg choice='plain'> --prefix </arg>
> +- <arg choice='plain'><replaceable>2001:db8:0001::/48</replaceable></arg>
> + <arg choice='plain'> --interface </arg>
> + <arg choice='plain'><replaceable>eth1</replaceable></arg>
> ++ <arg choice='plain'> --prefix </arg>
> ++ <arg choice='plain'><replaceable>2001:db8:0001::/48</replaceable></arg>
> + <arg choice='plain'> --interval </arg>
> + <arg choice='plain'><replaceable>30000</replaceable></arg>
> ++ <arg choice='plain'> --rank </arg>
> ++ <arg choice='plain'><replaceable>1</replaceable></arg>
> + <arg choice='plain'> --timelog </arg>
> + <arg choice='plain'> --verbose </arg>
> + </cmdsynopsis>
> diff --git a/patches/unstrung-1.11.0/0005-Makefile-replace-arch-with-uname-m.patch b/patches/unstrung-1.11.0/0005-Makefile-replace-arch-with-uname-m.patch
> new file mode 100644
> index 0000000..11f66dc
> --- /dev/null
> +++ b/patches/unstrung-1.11.0/0005-Makefile-replace-arch-with-uname-m.patch
> @@ -0,0 +1,37 @@
> +From: Alexander Aring <aar@pengutronix.de>
> +Date: Tue, 26 Apr 2016 11:40:50 +0200
> +Subject: [PATCH] Makefile: replace arch with uname -m
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +According to:
> +
> +https://www.gnu.org/software/coreutils/manual/html_node/arch-invocation.html#arch-invocation
> +
> +"arch is not installed by default, so portable scripts should not rely
> +on its existence.", but
> +
> +"arch prints the machine hardware name, and is equivalent to ‘uname -m’."
> +
> +My system has no "arch" command, so we change it to "uname -m" which
> +is more common to work.
> +
> +Signed-off-by: Alexander Aring <aar@pengutronix.de>
> +---
> + Makefile.inc | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.inc b/Makefile.inc
> +index 3d5bfd9429a9..f56355c656cc 100644
> +--- a/Makefile.inc
> ++++ b/Makefile.inc
> +@@ -23,7 +23,7 @@ ifneq ($(EMBEDDED),)
> + CFLAGS+=-DEMBEDDED
> + endif
> +
> +-ARCH?=$(shell arch)
> ++ARCH?=$(shell uname -m)
> + ifeq ($(USE_OBJDIR),true)
> + OBJDIR?=OBJ.${ARCH}
> + else
> diff --git a/patches/unstrung-1.11.0/series b/patches/unstrung-1.11.0/series
> new file mode 100644
> index 0000000..0c3e17c
> --- /dev/null
> +++ b/patches/unstrung-1.11.0/series
> @@ -0,0 +1,8 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Makefile-remove-twice-DESTDIR-for-man-pages.patch
> +0002-main-interface-needs-argument.patch
> +0003-main-remove-double-dagid-entry.patch
> +0004-man-reorder-sunshine-arguments.patch
> +0005-Makefile-replace-arch-with-uname-m.patch
> +# dc7313eb94e2e35bda5089c95eec363d - git-ptx-patches magic
> diff --git a/rules/unstrung.in b/rules/unstrung.in
> new file mode 100644
> index 0000000..a146367
> --- /dev/null
> +++ b/rules/unstrung.in
> @@ -0,0 +1,26 @@
> +## SECTION=networking
> +
> +menuconfig UNSTRUNG
> + tristate
> + prompt "unstrung "
> + select BOOST
> + help
> + Unstrung is an implementation of the IETF ROLL Working Group's RPL
> + RFC6550 routing protocol. RPL is pronounced Ripple. RPL is an IETF
> + protocol that provides connectivity among nodes that can not all
> + hear each other, but rather have to form a multihop mesh-like
> + network.
> +
> +if UNSTRUNG
> +
> +config UNSTRUNG_TESTING
> + bool
> + prompt "testing tools"
> + select LIBPCAP
> + select LIBUSB
This does not work. Add those to the main option conditionally.
> + help
> + If enabled testing programs peck, senddio, senddao will be builed and
> + installed.
> +
> +endif
> +
> diff --git a/rules/unstrung.make b/rules/unstrung.make
> new file mode 100644
> index 0000000..cb62c4a
> --- /dev/null
> +++ b/rules/unstrung.make
> @@ -0,0 +1,63 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2016 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_UNSTRUNG) += unstrung
> +
> +#
> +# Paths and names
> +#
> +UNSTRUNG_VERSION := 1.11.0
> +UNSTRUNG_MD5 := b18fa7644f19688e75eb37475816d73a
> +UNSTRUNG := unstrung-$(UNSTRUNG_VERSION)
> +UNSTRUNG_SUFFIX := tar.gz
> +UNSTRUNG_URL := http://unstrung.sandelman.ca/downloads/$(UNSTRUNG).$(UNSTRUNG_SUFFIX)
> +UNSTRUNG_SOURCE := $(SRCDIR)/$(UNSTRUNG).$(UNSTRUNG_SUFFIX)
> +UNSTRUNG_DIR := $(BUILDDIR)/$(UNSTRUNG)
> +UNSTRUNG_LICENSE := GPL
GPL-2.0+ right?
Michael
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +UNSTRUNG_CONF_TOOL := NO
> +UNSTRUNG_COMPILE_ENV := \
> + $(CROSS_ENV) \
> + ARCH=$(PTXCONF_ARCH_STRING) \
> + EMBEDDED=$(call ptx/ifdef,PTXCONF_UNSTRUNG_TESTING,,1)
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/unstrung.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, unstrung)
> + @$(call install_fixup, unstrung,PRIORITY,optional)
> + @$(call install_fixup, unstrung,SECTION,base)
> + @$(call install_fixup, unstrung,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
> + @$(call install_fixup, unstrung,DESCRIPTION,missing)
> +
> + @$(call install_copy, unstrung, 0, 0, 0755, -, /sbin/sunshine)
> +
> +ifdef PTXCONF_UNSTRUNG_TESTING
> + @$(call install_copy, unstrung, 0, 0, 0755, -, /sbin/peck)
> + @$(call install_copy, unstrung, 0, 0, 0755, -, /sbin/senddao)
> + @$(call install_copy, unstrung, 0, 0, 0755, -, /sbin/senddio)
> +endif
> +
> + @$(call install_finish, unstrung)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.8.0
>
>
> _______________________________________________
> 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
next prev parent reply other threads:[~2016-04-27 13:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 11:00 Alexander Aring
2016-04-26 11:00 ` [ptxdist] [PATCH 2/2] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
2016-04-27 13:02 ` Michael Olbrich [this message]
2016-04-27 15:34 ` [ptxdist] [PATCH 1/2] unstrung: initial commit Alexander Aring
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=20160427130252.GC30012@pengutronix.de \
--to=m.olbrich@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