On Wed, Apr 27, 2016 at 05:54:20PM +0200, Alexander Aring wrote: > Cc: Michael Richardson <[email protected]> > Signed-off-by: Alexander Aring <[email protected]>
Tnx, all applied. Michael > --- > changes since v2: > - remove unnecessary patches and add implementation fixes only. > - move select LIBPCAP and LIBUSB to main config entry > - fix LICENSE to GPL-2.0+, I saw some implementation file header > which says "GPL 2 or later...". > > .../0001-main-interface-needs-argument.patch | 24 +++++++++ > .../0002-main-remove-double-dagid-entry.patch | 21 ++++++++ > patches/unstrung-1.11.0/series | 5 ++ > rules/unstrung.in | 26 +++++++++ > rules/unstrung.make | 63 > ++++++++++++++++++++++ > 5 files changed, 139 insertions(+) > create mode 100644 > patches/unstrung-1.11.0/0001-main-interface-needs-argument.patch > create mode 100644 > patches/unstrung-1.11.0/0002-main-remove-double-dagid-entry.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-main-interface-needs-argument.patch > b/patches/unstrung-1.11.0/0001-main-interface-needs-argument.patch > new file mode 100644 > index 0000000..33022ea > --- /dev/null > +++ b/patches/unstrung-1.11.0/0001-main-interface-needs-argument.patch > @@ -0,0 +1,24 @@ > +From: Alexander Aring <[email protected]> > +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 <[email protected]> > +--- > + 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/0002-main-remove-double-dagid-entry.patch > b/patches/unstrung-1.11.0/0002-main-remove-double-dagid-entry.patch > new file mode 100644 > index 0000000..802b7ea > --- /dev/null > +++ b/patches/unstrung-1.11.0/0002-main-remove-double-dagid-entry.patch > @@ -0,0 +1,21 @@ > +From: Alexander Aring <[email protected]> > +Date: Tue, 26 Apr 2016 11:25:44 +0200 > +Subject: [PATCH] main: remove double dagid entry > + > +Signed-off-by: Alexander Aring <[email protected]> > +--- > + 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/series b/patches/unstrung-1.11.0/series > new file mode 100644 > index 0000000..21a45d9 > --- /dev/null > +++ b/patches/unstrung-1.11.0/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-main-interface-needs-argument.patch > +0002-main-remove-double-dagid-entry.patch > +# 248ced0a83ec2ee376156e1599d6779f - git-ptx-patches magic > diff --git a/rules/unstrung.in b/rules/unstrung.in > new file mode 100644 > index 0000000..61b87a9 > --- /dev/null > +++ b/rules/unstrung.in > @@ -0,0 +1,26 @@ > +## SECTION=networking > + > +menuconfig UNSTRUNG > + tristate > + prompt "unstrung " > + select BOOST > + select LIBPCAP > + select LIBUSB > + 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" > + 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..85ee845 > --- /dev/null > +++ b/rules/unstrung.make > @@ -0,0 +1,63 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2016 by Alexander Aring <[email protected]> > +# > +# 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-2.0+ > + > +# > ---------------------------------------------------------------------------- > +# 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 > <[email protected]>") > + @$(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 > [email protected] -- 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 [email protected]
