mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] wireshark: rework and update to wireshark 1.8.7
@ 2013-05-27 11:54 Alexander Aring
  2013-06-03 11:53 ` Michael Olbrich
  0 siblings, 1 reply; 4+ messages in thread
From: Alexander Aring @ 2013-05-27 11:54 UTC (permalink / raw)
  To: ptxdist; +Cc: Alexander Aring

This patch removes the build of common gtk-interface wireshark.
Instead of the gtk-interface you can use the cli-interface (tshark) to
capture network traffic into 'capture files'.
On the host side, the gtk-wireshark interface can open the capture files
and show the captured packets.

I let the KConfig name to WIRESHARK, because it is a common name and all
people who wants 'wireshark' on embedded targets mean 'tshark'.

Various changes at configure call:
  - Remove pcre directory parameter. This is removed in the new
    wireshark version.

  - Add --without-plugins to remove plugins build, see below.

  - Only enable various tools which are important for cli work.
    These tools are:
      - dumpcap, needed by tshark to capture into files.
      - editcap, edit capture files.
      - mergecap, merge capture files.
      - capinfos, show infos of capture files.

Remove patches:

Remove patch 0001-remove-prefix-from-search-paths.patch:
  - This patch is already mainlined see:
    http://anonsvn.wireshark.org/viewvc?view=revision&revision=48583

Remove patch 0002-remove-AC_TRY_RUN-tests.patch:
  - I don't have any cross-compiling issues without this patch at the
    moment.

Remove patch
0003-plugins-Makefile.am-don-t-add-includedir-to-header-s.patch:
  - This patch is not needed anymore because we add --without-plugins
    to configure part. The old wireshark rule compile plugins but not
    install them. I think plugins does only work with the gtk frontend.
    To add extra protocols or similar.

Tested with the current libcap version 1.1.1, I will update this in the
next days.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 .../0001-remove-prefix-from-search-paths.patch     |  53 ------
 .../0002-remove-AC_TRY_RUN-tests.patch             | 117 -------------
 ...efile.am-don-t-add-includedir-to-header-s.patch | 182 ---------------------
 patches/wireshark-1.2.5/autogen-generic.sh         |   1 -
 patches/wireshark-1.2.5/autogen.sh                 |   7 -
 patches/wireshark-1.2.5/series                     |   3 -
 rules/wireshark.in                                 |  37 ++---
 rules/wireshark.make                               |  47 +++---
 8 files changed, 34 insertions(+), 413 deletions(-)
 delete mode 100644 patches/wireshark-1.2.5/0001-remove-prefix-from-search-paths.patch
 delete mode 100644 patches/wireshark-1.2.5/0002-remove-AC_TRY_RUN-tests.patch
 delete mode 100644 patches/wireshark-1.2.5/0003-plugins-Makefile.am-don-t-add-includedir-to-header-s.patch
 delete mode 120000 patches/wireshark-1.2.5/autogen-generic.sh
 delete mode 100755 patches/wireshark-1.2.5/autogen.sh
 delete mode 100644 patches/wireshark-1.2.5/series

diff --git a/patches/wireshark-1.2.5/0001-remove-prefix-from-search-paths.patch b/patches/wireshark-1.2.5/0001-remove-prefix-from-search-paths.patch
deleted file mode 100644
index 4ad8200..0000000
--- a/patches/wireshark-1.2.5/0001-remove-prefix-from-search-paths.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 41a94e0551b266e3e993c373f6b04f158848e643 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 14 Jan 2010 19:33:20 +0100
-Subject: [PATCH 1/3] remove prefix from search paths
-
-configure adds prefix/include and prefix/lib to the search paths.
-This breaks cross-compiling with DESTDIR
-This patch removes this broken stuff.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.in |   24 ------------------------
- 1 files changed, 0 insertions(+), 24 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 1287d32..72ebdda 100644
---- a/configure.in
-+++ b/configure.in
-@@ -445,30 +445,6 @@ darwin*)
- esac
- AC_SUBST(FRAMEWORKS)
- 
--#
--# If using $prefix we add "$prefix/include" to the include search path
--# and "$prefix/lib" to the library search path.
--#
--if test "x$prefix" != "x" ; then
--	AC_MSG_CHECKING(whether to use $prefix for headers and libraries)
--	if test -d $prefix/include ; then
--		AC_MSG_RESULT(yes)
--		#
--		# Arrange that we search for header files in "$prefix/include", as
--		# various packages we use may have been installed under "$prefix/include".
--		#
--		CFLAGS="$CFLAGS -I$prefix/include"
--		CPPFLAGS="$CPPFLAGS -I$prefix/include"
--
--		#
--		# Arrange that we search for libraries in "$prefix/lib".
--		#
--		AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib)
--	else
--		AC_MSG_RESULT(no)
--	fi
--fi
--
- dnl Look in /usr/local for header files and libraries ?
- dnl XXX FIXME don't include /usr/local if it is already in the system
- dnl search path as this causes gcc 3.2 on Linux to complain about a change
--- 
-1.6.6
-
diff --git a/patches/wireshark-1.2.5/0002-remove-AC_TRY_RUN-tests.patch b/patches/wireshark-1.2.5/0002-remove-AC_TRY_RUN-tests.patch
deleted file mode 100644
index 92e0460..0000000
--- a/patches/wireshark-1.2.5/0002-remove-AC_TRY_RUN-tests.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 7d7309967576628677a9b9d75f14e8309bfd6aa1 Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Thu, 14 Jan 2010 19:33:20 +0100
-Subject: [PATCH 2/3] remove AC_TRY_RUN tests
-
-AC_TRY_RUN does not work when cross-compiling.
-The other test result seems to break the build, so I guess
-this is save for us.
-
-Not for upstream.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- configure.in |   78 ----------------------------------------------------------
- 1 files changed, 0 insertions(+), 78 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 72ebdda..ccd8ad1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1404,92 +1404,14 @@ AC_SUBST(STRNCASECMP_O)
- 
- AC_CHECK_FUNCS(mkstemp mkdtemp)
- 
--#
--# XXX - if inet_aton isn't found, the build fails, with a complaint from
--# libtool about inet_aton.lo not being a valid libtool object.  We
--# probably have to handle it - and all the other replacement functions that
--# get built into libwireshark - differently.
--#
--AC_SEARCH_LIBS(inet_aton, [socket nsl], have_inet_aton=yes,
--    have_inet_aton=no)
--if test "$have_inet_aton" = no; then
--  INET_ATON_C="inet_aton.c"
--  INET_ATON_O="inet_aton.o"
--  INET_ATON_LO="inet_aton.lo"
--  AC_DEFINE(NEED_INET_ATON_H, 1, [Define if inet/aton.h needs to be included])
--else
--  INET_ATON_C=""
--  INET_ATON_O=""
--  INET_ATON_LO=""
--fi
- AC_SUBST(INET_ATON_C)
- AC_SUBST(INET_ATON_O)
- AC_SUBST(INET_ATON_LO)
- 
--AC_SEARCH_LIBS(inet_pton, [socket nsl], [
--  dnl check for pre-BIND82 inet_pton() bug.
--  AC_MSG_CHECKING(for broken inet_pton)
--  AC_TRY_RUN([#include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--int main()
--{
--#ifdef AF_INET6
--  char buf[16];
--  /* this should return 0 (error) */
--  return inet_pton(AF_INET6, "0:1:2:3:4:5:6:7:", buf);
--#else
--  return 1;
--#endif
--}], [AC_MSG_RESULT(ok);
--have_inet_pton=yes], [AC_MSG_RESULT(broken);
--have_inet_pton=no], [AC_MSG_RESULT(cross compiling, assume it is broken);
--have_inet_pton=no])],
--have_inet_pton=no)
--if test "$have_inet_pton" = no; then
--  INET_PTON_C="inet_pton.c"
--  INET_PTON_O="inet_pton.o"
--  INET_PTON_LO="inet_pton.lo"
--else
--  INET_PTON_C=""
--  INET_PTON_O=""
--  INET_PTON_LO=""
--fi
- AC_SUBST(INET_PTON_C)
- AC_SUBST(INET_PTON_O)
- AC_SUBST(INET_PTON_LO)
- 
--AC_SEARCH_LIBS(inet_ntop, [socket nsl], [
--  AC_MSG_CHECKING([for inet_ntop prototype])
--  AC_TRY_COMPILE([#include <stdio.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--
--extern const char *inet_ntop(int, const void *, char *, size_t);],, [
--    AC_MSG_RESULT(yes)
--    AC_DEFINE(HAVE_INET_NTOP_PROTO, 1,
--    [Define if inet_ntop() prototype exists])], [
--    AC_TRY_COMPILE([#include <stdio.h>
--#include <sys/types.h>
--#include <sys/socket.h>
--#include <netinet/in.h>
--#include <arpa/inet.h>
--
--extern const char *inet_ntop(int, const void *, char *, socklen_t);],, [
--      AC_MSG_RESULT(yes)
--      AC_DEFINE(HAVE_INET_NTOP_PROTO, 1,
--      [Define if inet_ntop() prototype exists])], [
--      AC_MSG_RESULT(no)])])
--  INET_NTOP_O=""
--  INET_NTOP_LO=""], [
--  INET_NTOP_C="inet_ntop.c"
--  INET_NTOP_O="inet_ntop.o"
--  INET_NTOP_LO="inet_ntop.lo"
--  AC_DEFINE(NEED_INET_V6DEFS_H, 1,
--  [Define if inet/v6defs.h needs to be included])])
- AC_SUBST(INET_NTOP_C)
- AC_SUBST(INET_NTOP_O)
- AC_SUBST(INET_NTOP_LO)
--- 
-1.6.6
-
diff --git a/patches/wireshark-1.2.5/0003-plugins-Makefile.am-don-t-add-includedir-to-header-s.patch b/patches/wireshark-1.2.5/0003-plugins-Makefile.am-don-t-add-includedir-to-header-s.patch
deleted file mode 100644
index ad6df5e..0000000
--- a/patches/wireshark-1.2.5/0003-plugins-Makefile.am-don-t-add-includedir-to-header-s.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From e54ab6090f2ebf9353f3b873b73589c4a40b5fc0 Mon Sep 17 00:00:00 2001
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Thu, 14 Jan 2010 19:30:30 +0100
-Subject: [PATCH 3/3] plugins/*/Makefile.am: don't add $includedir to header search path
-
-As $includedir is usually /usr/include, host includes leak in.
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
----
- plugins/asn1/Makefile.am       |    2 +-
- plugins/docsis/Makefile.am     |    2 +-
- plugins/ethercat/Makefile.am   |    2 +-
- plugins/gryphon/Makefile.am    |    2 +-
- plugins/irda/Makefile.am       |    2 +-
- plugins/m2m/Makefile.am        |    2 +-
- plugins/opcua/Makefile.am      |    2 +-
- plugins/profinet/Makefile.am   |    2 +-
- plugins/sercosiii/Makefile.am  |    2 +-
- plugins/unistim/Makefile.am    |    2 +-
- plugins/wimax/Makefile.am      |    2 +-
- plugins/wimaxasncp/Makefile.am |    2 +-
- 12 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/plugins/asn1/Makefile.am b/plugins/asn1/Makefile.am
-index 8436c4b..835357f 100644
---- a/plugins/asn1/Makefile.am
-+++ b/plugins/asn1/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am
-index 642fc95..4b86138 100644
---- a/plugins/docsis/Makefile.am
-+++ b/plugins/docsis/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am
-index d684b28..8f77011 100644
---- a/plugins/ethercat/Makefile.am
-+++ b/plugins/ethercat/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am
-index 9d54753..94d103c 100644
---- a/plugins/gryphon/Makefile.am
-+++ b/plugins/gryphon/Makefile.am
-@@ -24,7 +24,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am
-index 78c5a01..462847e 100644
---- a/plugins/irda/Makefile.am
-+++ b/plugins/irda/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am
-index bdbc023..455c450 100644
---- a/plugins/m2m/Makefile.am
-+++ b/plugins/m2m/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir) -I../wimax
-+INCLUDES = -I$(top_srcdir) -I../wimax
- 
- include Makefile.common
- 
-diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am
-index 3e75671..50f474f 100644
---- a/plugins/opcua/Makefile.am
-+++ b/plugins/opcua/Makefile.am
-@@ -23,7 +23,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am
-index 65d2105..a396525 100644
---- a/plugins/profinet/Makefile.am
-+++ b/plugins/profinet/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/sercosiii/Makefile.am b/plugins/sercosiii/Makefile.am
-index f7e682b..a651b01 100644
---- a/plugins/sercosiii/Makefile.am
-+++ b/plugins/sercosiii/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am
-index 2d16716..1d0b0df 100644
---- a/plugins/unistim/Makefile.am
-+++ b/plugins/unistim/Makefile.am
-@@ -23,7 +23,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am
-index 764f84c..6783b63 100644
---- a/plugins/wimax/Makefile.am
-+++ b/plugins/wimax/Makefile.am
-@@ -22,7 +22,7 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
-diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am
-index f17c871..f51482c 100644
---- a/plugins/wimaxasncp/Makefile.am
-+++ b/plugins/wimaxasncp/Makefile.am
-@@ -25,7 +25,7 @@
- # lex rules
- include $(top_srcdir)/Makefile.am.inc
- 
--INCLUDES = -I$(top_srcdir) -I$(includedir)
-+INCLUDES = -I$(top_srcdir)
- 
- include Makefile.common
- 
--- 
-1.6.6
-
diff --git a/patches/wireshark-1.2.5/autogen-generic.sh b/patches/wireshark-1.2.5/autogen-generic.sh
deleted file mode 120000
index 9f8a4cb..0000000
--- a/patches/wireshark-1.2.5/autogen-generic.sh
+++ /dev/null
@@ -1 +0,0 @@
-../autogen.sh
\ No newline at end of file
diff --git a/patches/wireshark-1.2.5/autogen.sh b/patches/wireshark-1.2.5/autogen.sh
deleted file mode 100755
index 019676e..0000000
--- a/patches/wireshark-1.2.5/autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-ACLOCAL_FLAGS="-Iaclocal-fallback"
-export ACLOCAL_FLAGS
-
-`dirname $0`/autogen-generic.sh
-
diff --git a/patches/wireshark-1.2.5/series b/patches/wireshark-1.2.5/series
deleted file mode 100644
index 0684fe9..0000000
--- a/patches/wireshark-1.2.5/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-remove-prefix-from-search-paths.patch
-0002-remove-AC_TRY_RUN-tests.patch
-0003-plugins-Makefile.am-don-t-add-includedir-to-header-s.patch
diff --git a/rules/wireshark.in b/rules/wireshark.in
index cc9540b..b8a99c6 100644
--- a/rules/wireshark.in
+++ b/rules/wireshark.in
@@ -1,32 +1,17 @@
 ## SECTION=networking
-menuconfig WIRESHARK
+
+config WIRESHARK
 	tristate
-	prompt "wireshark                     "
+	prompt "tshark (cli of wireshark)"
 	select LIBC_M
 	select LIBPCAP
 	select GLIB
-	select LIBPCRE
 	help
-	  Wireshark is a network traffic analyzer for Unix
-	  and Unix-like operating systems. It is a tool used
-	  to capture packets off the wire. Wireshark decodes
-	  numerous protocols (too many to list).
-
-if WIRESHARK
-
-config WIRESHARK_TSHARK
-	bool
-
-	prompt "tshark"
-	help
-	  This is the textmode version of wireshark
-
-# FIXME:
-#config WIRESHARK_WIRESHARK
-#	bool
-#	prompt "wireshark"
-#	help
-#	  This is the graphical version of wireshark
-#
-
-endif
+	  TShark is a network protocol analyzer.  It lets you capture packet data
+	  from a live network, or read packets from a previously saved capture
+	  file, either printing a decoded form of those packets to the standard
+	  output or writing the packets to a file.  TShark's native capture file
+	  format is libpcap format, which is also the format used by tcpdump and
+	  various other tools. TShark is able to detect, read and write the same
+	  capture files that are supported by Wireshark. The gtk frontend wireshark
+	  can open the capture file and display the content of capture.
diff --git a/rules/wireshark.make b/rules/wireshark.make
index fbf666f..01b5959 100644
--- a/rules/wireshark.make
+++ b/rules/wireshark.make
@@ -2,6 +2,7 @@
 #
 # Copyright (C) 2006 by Juergen Beisert
 #           (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de>
+#           (C) 2013 by Alexander Aring <aar@pengutronix.de>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -17,10 +18,10 @@ PACKAGES-$(PTXCONF_WIRESHARK) += wireshark
 #
 # Paths and names
 #
-WIRESHARK_VERSION	:= 1.2.5
-WIRESHARK_MD5		:= fdc1bc9815ee7ba067094edf60f7b9ff
+WIRESHARK_VERSION	:= 1.8.7
+WIRESHARK_MD5		:= f4198728a20aa40752906031e08544f8
 WIRESHARK		:= wireshark-$(WIRESHARK_VERSION)
-WIRESHARK_SUFFIX	:= tar.gz
+WIRESHARK_SUFFIX	:= tar.bz2
 WIRESHARK_URL		:= http://www.wireshark.org/download/src/all-versions/$(WIRESHARK).$(WIRESHARK_SUFFIX)
 WIRESHARK_SOURCE	:= $(SRCDIR)/$(WIRESHARK).$(WIRESHARK_SUFFIX)
 WIRESHARK_DIR		:= $(BUILDDIR)/$(WIRESHARK)
@@ -37,33 +38,31 @@ WIRESHARK_ENV 	:= $(CROSS_ENV)
 #
 WIRESHARK_AUTOCONF = \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_IPV6_OPTION) \
 	--disable-usr-local \
-	--disable-threads \
+	--disable-wireshark \
+	--disable-packet-editor \
 	--disable-profile-build \
+	--disable-gtktest \
 	--disable-glibtest \
-	--disable-editcap \
-	--disable-mergecap \
+	--enable-tshark \
+	--enable-editcap \
+	--enable-capinfos \
+	--enable-mergecap \
 	--disable-text2pcap \
 	--disable-dftest \
 	--disable-randpkt \
+	--disable-airpcap \
+	--enable-dumpcap \
+	--disable-rawshark \
+	--disable-pcap-ng-default \
+	$(GLOBAL_IPV6_OPTION) \
+	--disable-setcap-install \
+	--disable-setuid-install \
 	--with-pcap=$(LIBPCAP_DIR) \
-	--with-pcre \
+	--without-plugins \
 	--without-gcrypt \
 	--without-libcap
 
-ifdef PTXCONF_WIRESHARK_TSHARK
-WIRESHARK_AUTOCONF	+= --enable-tshark
-else
-WIRESHARK_AUTOCONF	+= --disable-tshark
-endif
-
-ifdef PTXCONF_WIRESHARK_WIRESHARK
-WIRESHARK_AUTOCONF	+= --enable-wireshark
-else
-WIRESHARK_AUTOCONF	+= --disable-wireshark
-endif
-
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -79,17 +78,17 @@ $(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/mergecap)
 	@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/dumpcap)
-ifdef PTXCONF_WIRESHARK_TSHARK
 	@$(call install_copy, wireshark, 0, 0, 0755, -, /usr/bin/tshark)
-endif
 #
 # libraries used by some of the executables
 #
-	@$(call install_lib, wireshark, 0, 0, 0644, libwsutil)
-	@$(call install_lib, wireshark, 0, 0, 0644, libwiretap)
 	@$(call install_lib, wireshark, 0, 0, 0644, libwireshark)
+	@$(call install_lib, wireshark, 0, 0, 0644, libwiretap)
+	@$(call install_lib, wireshark, 0, 0, 0644, libwsutil)
 
 	@$(call install_finish, wireshark)
 
-- 
1.8.2.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-01-30  9:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-27 11:54 [ptxdist] [PATCH] wireshark: rework and update to wireshark 1.8.7 Alexander Aring
2013-06-03 11:53 ` Michael Olbrich
2014-01-27  7:33   ` Alexander Aring
2014-01-30  9:01     ` Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox