* [ptxdist] [PATCHv2 1/4] unstrung: initial commit
@ 2016-04-27 15:54 Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Alexander Aring @ 2016-04-27 15:54 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring, Michael Richardson
Cc: Michael Richardson <mcr@sandelman.ca>
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
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 <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/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 <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/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 <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-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 <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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
@ 2016-04-27 15:54 ` Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 3/4] libpcap: version bump 1.5.3 -> 1.7.4 Alexander Aring
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Aring @ 2016-04-27 15:54 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
rules/wpan-tools.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/wpan-tools.make b/rules/wpan-tools.make
index ddd882e..ccc4e11 100644
--- a/rules/wpan-tools.make
+++ b/rules/wpan-tools.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_WPAN_TOOLS) += wpan-tools
#
# Paths and names
#
-WPAN_TOOLS_VERSION := 0.5
-WPAN_TOOLS_MD5 := c6356f7be4de2e9f2084283b9ed7e1ab
+WPAN_TOOLS_VERSION := 0.6
+WPAN_TOOLS_MD5 := 05322b1bc2fcdc040d326f0a5017aa4e
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)
--
2.8.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 3/4] libpcap: version bump 1.5.3 -> 1.7.4
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
@ 2016-04-27 15:54 ` Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 4/4] wireshark: version bump 1.10.6 -> 2.0.3 Alexander Aring
2016-05-17 6:31 ` [ptxdist] [PATCHv2 1/4] unstrung: initial commit Michael Olbrich
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Aring @ 2016-04-27 15:54 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
.../0001-build-and-install-share-lib-only.patch | 6 +++---
.../0002-pcap-config-add-SYSROOT-support.patch | 2 +-
.../0003-configure.in-allow-specifying-path-for-libnl3.patch | 10 +++++-----
patches/{libpcap-1.5.3 => libpcap-1.7.4}/autogen.sh | 0
patches/{libpcap-1.5.3 => libpcap-1.7.4}/series | 0
rules/libpcap.make | 11 +++++++----
6 files changed, 16 insertions(+), 13 deletions(-)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/0001-build-and-install-share-lib-only.patch (88%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/0002-pcap-config-add-SYSROOT-support.patch (95%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/0003-configure.in-allow-specifying-path-for-libnl3.patch (77%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/autogen.sh (100%)
rename patches/{libpcap-1.5.3 => libpcap-1.7.4}/series (100%)
diff --git a/patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch
similarity index 88%
rename from patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch
rename to patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch
index 6803037..c12a5b9 100644
--- a/patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch
+++ b/patches/libpcap-1.7.4/0001-build-and-install-share-lib-only.patch
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 2784960..653b353 100644
+index 4c35bde7caab..d472dd487d71 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -356,7 +356,7 @@ EXTRA_DIST = \
+@@ -358,7 +358,7 @@ EXTRA_DIST = \
Win32/Src/inet_net.c \
Win32/Src/inet_pton.c
@@ -24,7 +24,7 @@ index 2784960..653b353 100644
libpcap.a: $(OBJ)
@rm -f $@
-@@ -544,7 +544,7 @@ selpolltest: tests/selpolltest.c libpcap.a
+@@ -549,7 +549,7 @@ selpolltest: tests/selpolltest.c libpcap.a
valgrindtest: tests/valgrindtest.c libpcap.a
$(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS)
diff --git a/patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch
similarity index 95%
rename from patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch
rename to patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch
index 5a6e85f..51cf6c5 100644
--- a/patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch
+++ b/patches/libpcap-1.7.4/0002-pcap-config-add-SYSROOT-support.patch
@@ -8,7 +8,7 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pcap-config.in b/pcap-config.in
-index 206be3b..50b05f5 100644
+index 206be3b4a644..50b05f53d32e 100644
--- a/pcap-config.in
+++ b/pcap-config.in
@@ -6,8 +6,8 @@
diff --git a/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch b/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch
similarity index 77%
rename from patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch
rename to patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch
index df133a0..0318ac8 100644
--- a/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch
+++ b/patches/libpcap-1.7.4/0003-configure.in-allow-specifying-path-for-libnl3.patch
@@ -7,19 +7,19 @@ Subject: [PATCH] configure.in: allow specifying path for libnl3
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.in b/configure.in
-index 2cae646..a83acdf 100644
+index be4b29e2f8ba..34dcf02a1481 100644
--- a/configure.in
+++ b/configure.in
-@@ -460,7 +460,11 @@ linux)
+@@ -476,7 +476,11 @@ linux)
AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
-- V_INCLS="$V_INCLS -I/usr/include/libnl3"
+- V_INCLS="$V_INCLS ${incdir}"
+ if test x$with_libnl != xyes ; then
+ V_INCLS="$V_INCLS -I${with_libnl}/include/libnl3"
+ else
-+ V_INCLS="$V_INCLS -I/usr/include/libnl3"
++ V_INCLS="$V_INCLS ${incdir}"
+ fi
have_any_nl="yes"
- ])
+ ],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )
diff --git a/patches/libpcap-1.5.3/autogen.sh b/patches/libpcap-1.7.4/autogen.sh
similarity index 100%
rename from patches/libpcap-1.5.3/autogen.sh
rename to patches/libpcap-1.7.4/autogen.sh
diff --git a/patches/libpcap-1.5.3/series b/patches/libpcap-1.7.4/series
similarity index 100%
rename from patches/libpcap-1.5.3/series
rename to patches/libpcap-1.7.4/series
diff --git a/rules/libpcap.make b/rules/libpcap.make
index 88a3686..a18f9fa 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap
#
# Paths and names
#
-LIBPCAP_VERSION := 1.5.3
-LIBPCAP_MD5 := 7e7321fb3aff2f2bb05c8229f3795d4a
+LIBPCAP_VERSION := 1.7.4
+LIBPCAP_MD5 := b2e13142bbaba857ab1c6894aedaf547
LIBPCAP := libpcap-$(LIBPCAP_VERSION)
LIBPCAP_SUFFIX := tar.gz
LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX)
@@ -47,19 +47,22 @@ LIBPCAP_COMPILE_ENV := \
#
LIBPCAP_AUTOCONF := \
$(CROSS_AUTOCONF_USR) \
- $(GLOBAL_IPV6_OPTION) \
--enable-protochain \
+ $(GLOBAL_IPV6_OPTION) \
--disable-optimizer-dbg \
--disable-yydebug \
--disable-universal \
--enable-shared \
+ --disable-usb \
--$(call ptx/endis, PTXCONF_LIBPCAP_BLUETOOTH)-bluetooth \
--disable-canusb \
--disable-can \
--disable-dbus \
+ --disable-packet-ring \
--with-libnl=$(SYSROOT)/usr \
--without-dag \
- --without-septel
+ --without-septel \
+ --without-snf
ifdef PTXCONF_ARCH_MINGW
LIBPCAP_AUTOCONF += --with-pcap=null
--
2.8.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 4/4] wireshark: version bump 1.10.6 -> 2.0.3
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 3/4] libpcap: version bump 1.5.3 -> 1.7.4 Alexander Aring
@ 2016-04-27 15:54 ` Alexander Aring
2016-05-17 6:31 ` [ptxdist] [PATCHv2 1/4] unstrung: initial commit Michael Olbrich
3 siblings, 0 replies; 5+ messages in thread
From: Alexander Aring @ 2016-04-27 15:54 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Aring
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
.../0001-help_url-add-forgotten-HAVE_EXTCAP.patch | 25 ++++++++++++++++++++++
patches/wireshark-2.0.3/series | 4 ++++
rules/wireshark.make | 23 +++++++++++++++-----
3 files changed, 47 insertions(+), 5 deletions(-)
create mode 100644 patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch
create mode 100644 patches/wireshark-2.0.3/series
diff --git a/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch
new file mode 100644
index 0000000..01f0714
--- /dev/null
+++ b/patches/wireshark-2.0.3/0001-help_url-add-forgotten-HAVE_EXTCAP.patch
@@ -0,0 +1,25 @@
+From: Alexander Aring <aar@pengutronix.de>
+Date: Wed, 27 Apr 2016 16:51:08 +0200
+Subject: [PATCH] help_url: add forgotten HAVE_EXTCAP
+
+Signed-off-by: Alexander Aring <aar@pengutronix.de>
+---
+ ui/help_url.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ui/help_url.c b/ui/help_url.c
+index 7a2b9a026e1c..144eb9855f4c 100644
+--- a/ui/help_url.c
++++ b/ui/help_url.c
+@@ -265,9 +265,11 @@ topic_action_url(topic_action_e action)
+ case(HELP_EXPERT_INFO_DIALOG):
+ url = user_guide_url("ChAdvExpert.html");
+ break;
++#if HAVE_EXTCAP
+ case(HELP_EXTCAP_OPTIONS_DIALOG):
+ url = user_guide_url("ChExtcapOptions.html");
+ break;
++#endif
+ case(HELP_STATS_SUMMARY_DIALOG):
+ url = user_guide_url("ChStatSummary.html");
+ break;
diff --git a/patches/wireshark-2.0.3/series b/patches/wireshark-2.0.3/series
new file mode 100644
index 0000000..5c72479
--- /dev/null
+++ b/patches/wireshark-2.0.3/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-help_url-add-forgotten-HAVE_EXTCAP.patch
+# 71fce02a9deb431a1f0a2c4d041df890 - git-ptx-patches magic
diff --git a/rules/wireshark.make b/rules/wireshark.make
index b3fcb93..f572f9e 100644
--- a/rules/wireshark.make
+++ b/rules/wireshark.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_WIRESHARK) += wireshark
#
# Paths and names
#
-WIRESHARK_VERSION := 1.10.6
-WIRESHARK_MD5 := c67435039d67ef1757bfff0ab88824ab
+WIRESHARK_VERSION := 2.0.3
+WIRESHARK_MD5 := 62dc20f5a77542feed2e38f18db8ae3b
WIRESHARK := wireshark-$(WIRESHARK_VERSION)
WIRESHARK_SUFFIX := tar.bz2
WIRESHARK_URL := http://www.wireshark.org/download/src/all-versions/$(WIRESHARK).$(WIRESHARK_SUFFIX)
@@ -46,6 +46,7 @@ WIRESHARK_CONF_OPT = \
--enable-tshark \
--enable-editcap \
--enable-capinfos \
+ --enable-captype \
--enable-mergecap \
--enable-reordercap \
--disable-text2pcap \
@@ -54,14 +55,22 @@ WIRESHARK_CONF_OPT = \
--disable-airpcap \
--enable-dumpcap \
--disable-rawshark \
+ --disable-androiddump \
+ --disable-androiddump-use-libpcap \
+ --disable-echld \
+ --disable-tfshark \
--disable-pcap-ng-default \
$(GLOBAL_IPV6_OPTION) \
--disable-setcap-install \
--disable-setuid-install \
+ --without-qt \
+ --without-gtk2 \
+ --without-gtk3 \
--without-gnutls \
--without-gcrypt \
--with-libnl=3 \
--without-libsmi \
+ --without-osx-integration \
--with-pcap=$(SYSROOT)/usr \
--with-zlib \
--without-lua \
@@ -72,7 +81,9 @@ WIRESHARK_CONF_OPT = \
--without-c-ares \
--without-adns \
--without-geoip \
- --without-plugins
+ --without-sbc \
+ --without-plugins \
+ --without-extcap
# ----------------------------------------------------------------------------
# Target-Install
@@ -89,11 +100,13 @@ $(STATEDIR)/wireshark.targetinstall:
#
# executables
#
- @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/editcap)
@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/capinfos)
+ @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/captype)
+ @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap)
+ @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/editcap)
+ @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/idl2wrs)
@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/mergecap)
@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/reordercap)
- @$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap)
@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/tshark)
#
# libraries used by some of the executables
--
2.8.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [PATCHv2 1/4] unstrung: initial commit
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
` (2 preceding siblings ...)
2016-04-27 15:54 ` [ptxdist] [PATCH 4/4] wireshark: version bump 1.10.6 -> 2.0.3 Alexander Aring
@ 2016-05-17 6:31 ` Michael Olbrich
3 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2016-05-17 6:31 UTC (permalink / raw)
To: ptxdist
On Wed, Apr 27, 2016 at 05:54:20PM +0200, Alexander Aring wrote:
> Cc: Michael Richardson <mcr@sandelman.ca>
> Signed-off-by: Alexander Aring <aar@pengutronix.de>
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 <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/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 <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/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 <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-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 <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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-17 6:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-27 15:54 [ptxdist] [PATCHv2 1/4] unstrung: initial commit Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 2/4] wpan-tools: version bump 0.5 -> 0.6 Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 3/4] libpcap: version bump 1.5.3 -> 1.7.4 Alexander Aring
2016-04-27 15:54 ` [ptxdist] [PATCH 4/4] wireshark: version bump 1.10.6 -> 2.0.3 Alexander Aring
2016-05-17 6:31 ` [ptxdist] [PATCHv2 1/4] unstrung: initial commit Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox