From: Alexander Dahl <post@lespocky.de>
To: ptxdist@pengutronix.de
Cc: Alexander Dahl <post@lespocky.de>
Subject: [ptxdist] [PATCH v2] dropwatch: new package
Date: Tue, 20 Jun 2017 12:44:59 +0200 [thread overview]
Message-ID: <1497955499-7121-1-git-send-email-post@lespocky.de> (raw)
This adds a new package 'dropwatch', a tool for seeing where packets are
dropped in the kernel. It was recently moved to a new upstream URL and
is currently only available from Git. Included is one patch from
buildroot, which is not yet upstream. Tested on an at91sam9g20 platform.
Signed-off-by: Alexander Dahl <post@lespocky.de>
---
v1 -> v2: add dependency to binutils
---
.../0001-Fix-for-binutils-2.23.1.patch | 88 ++++++++++++++++++++++
patches/dropwatch-2015-07-06-g7c33d8a/series | 4 +
rules/dropwatch.in | 14 ++++
rules/dropwatch.make | 66 ++++++++++++++++
4 files changed, 172 insertions(+)
create mode 100644 patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch
create mode 100644 patches/dropwatch-2015-07-06-g7c33d8a/series
create mode 100644 rules/dropwatch.in
create mode 100644 rules/dropwatch.make
diff --git a/patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch b/patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch
new file mode 100644
index 0000000..4eb5bbf
--- /dev/null
+++ b/patches/dropwatch-2015-07-06-g7c33d8a/0001-Fix-for-binutils-2.23.1.patch
@@ -0,0 +1,88 @@
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Fri, 16 Jun 2017 08:50:03 +0200
+Subject: [PATCH] Fix for binutils 2.23.1
+
+libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf.
+Patch from https://fedorahosted.org/dropwatch/ticket/5
+Upstream status: new.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ src/lookup.c | 2 +-
+ src/lookup.h | 3 +++
+ src/lookup_bfd.c | 2 +-
+ src/lookup_kas.c | 2 +-
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/lookup.c b/src/lookup.c
+index ba5499173983..809981b674d3 100644
+--- a/src/lookup.c
++++ b/src/lookup.c
+@@ -27,13 +27,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+ #include "lookup.h"
++#include <bfd.h>
+
+ extern struct lookup_methods bfd_methods;
+ extern struct lookup_methods kallsym_methods;
+diff --git a/src/lookup.h b/src/lookup.h
+index e6568d8b9445..47a7b569870b 100644
+--- a/src/lookup.h
++++ b/src/lookup.h
+@@ -28,6 +28,9 @@
+ #include <stdlib.h>
+ #include <asm/types.h>
+
++// satisfy PR 14072 in bfd.h
++#define PACKAGE 1
++#define PACKAGE_VERSION 1
+
+ /*
+ * Initalization routine
+diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c
+index cc7010beecec..271d42682a11 100644
+--- a/src/lookup_bfd.c
++++ b/src/lookup_bfd.c
+@@ -25,13 +25,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+ #include "lookup.h"
++#include <bfd.h>
+
+
+ static int lookup_bfd_init(void)
+diff --git a/src/lookup_kas.c b/src/lookup_kas.c
+index 16e639fe5ae8..556cb62a9889 100644
+--- a/src/lookup_kas.c
++++ b/src/lookup_kas.c
+@@ -25,7 +25,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -33,6 +32,7 @@
+ #include <sys/queue.h>
+
+ #include "lookup.h"
++#include <bfd.h>
+
+ struct symbol_entry {
+ char *sym_name;
diff --git a/patches/dropwatch-2015-07-06-g7c33d8a/series b/patches/dropwatch-2015-07-06-g7c33d8a/series
new file mode 100644
index 0000000..cf27605
--- /dev/null
+++ b/patches/dropwatch-2015-07-06-g7c33d8a/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Fix-for-binutils-2.23.1.patch
+# 67ddfe89711030b81d1507e21ebd2023 - git-ptx-patches magic
diff --git a/rules/dropwatch.in b/rules/dropwatch.in
new file mode 100644
index 0000000..b432e81
--- /dev/null
+++ b/rules/dropwatch.in
@@ -0,0 +1,14 @@
+## SECTION=debug_tools
+
+config DROPWATCH
+ tristate
+ prompt "dropwatch"
+ select BINUTILS
+ select LIBNL3
+ select READLINE
+ help
+ user space utility for use with dropwatch kernel protocol
+
+ http://git.infradead.org/users/nhorman/dropwatch.git
+
+# vim: ft=kconfig noet tw=72
diff --git a/rules/dropwatch.make b/rules/dropwatch.make
new file mode 100644
index 0000000..8015158
--- /dev/null
+++ b/rules/dropwatch.make
@@ -0,0 +1,66 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Alexander Dahl <post@lespocky.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_DROPWATCH) += dropwatch
+
+#
+# Paths and names
+#
+# No tags: use a fake descriptive commit-ish to include the date
+DROPWATCH_VERSION := 2015-07-06-g7c33d8a
+DROPWATCH_MD5 := c4164e9f96bb5c0b801047685ed09ea5
+DROPWATCH := dropwatch-$(DROPWATCH_VERSION)
+DROPWATCH_SUFFIX := tar.gz
+DROPWATCH_URL := git://git.infradead.org/users/nhorman/dropwatch.git;tag=$(DROPWATCH_VERSION)
+DROPWATCH_SOURCE := $(SRCDIR)/$(DROPWATCH).$(DROPWATCH_SUFFIX)
+DROPWATCH_DIR := $(BUILDDIR)/$(DROPWATCH)
+DROPWATCH_LICENSE := GPL-2.0
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+DROPWATCH_CONF_TOOL := NO
+DROPWATCH_MAKE_ENV := $(CROSS_ENV)
+DROPWATCH_MAKE_OPT := build
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/dropwatch.install:
+ @$(call targetinfo)
+ install -D -m 0755 $(DROPWATCH_DIR)/src/dropwatch \
+ $(DROPWATCH_PKGDIR)/usr/bin/dropwatch
+ @$(call touch)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/dropwatch.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, dropwatch)
+ @$(call install_fixup, dropwatch,PRIORITY,optional)
+ @$(call install_fixup, dropwatch,SECTION,base)
+ @$(call install_fixup, dropwatch,AUTHOR,"Alexander Dahl <post@lespocky.de>")
+ @$(call install_fixup, dropwatch,DESCRIPTION,missing)
+
+ @$(call install_copy, dropwatch, 0, 0, 0755, -, /usr/bin/dropwatch)
+
+ @$(call install_finish, dropwatch)
+
+ @$(call touch)
+
+# vim: ft=make noet
--
2.1.4
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2017-06-20 10:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1497955499-7121-1-git-send-email-post@lespocky.de \
--to=post@lespocky.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