| Message ID | 1374451763-17956-1-git-send-email-tjlee@ambarella.com |
|---|---|
| State | Accepted |
| Headers | show |
>>>>> "T" == Tzu-Jung Lee <roylee17@gmail.com> writes:
T> Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
T> ---
T> v3 adopts all the review comments against v2 from Peter.
T> package/Config.in | 1 +
T> package/dropwatch/Config.in | 10 ++++++++++
T> package/dropwatch/dropwatch-1.4-build.patch | 27 ++++++++++++++++++++++++++
T> package/dropwatch/dropwatch.mk | 30 +++++++++++++++++++++++++++++
T> 4 files changed, 68 insertions(+)
T> create mode 100644 package/dropwatch/Config.in
T> create mode 100644 package/dropwatch/dropwatch-1.4-build.patch
T> create mode 100644 package/dropwatch/dropwatch.mk
T> diff --git a/package/Config.in b/package/Config.in
T> index b8011c7..1216450 100644
T> --- a/package/Config.in
T> +++ b/package/Config.in
T> @@ -22,6 +22,7 @@ source "package/cache-calibrator/Config.in"
T> source "package/dhrystone/Config.in"
T> source "package/dstat/Config.in"
T> source "package/dmalloc/Config.in"
T> +source "package/dropwatch/Config.in"
T> source "package/gdb/Config.in"
T> source "package/iozone/Config.in"
T> source "package/kexec/Config.in"
T> diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in
T> new file mode 100644
T> index 0000000..c7fc933
T> --- /dev/null
T> +++ b/package/dropwatch/Config.in
T> @@ -0,0 +1,10 @@
T> +config BR2_PACKAGE_DROPWATCH
T> + bool "dropwatch"
T> + select BR2_PACKAGE_BINUTILS
T> + select BR2_PACKAGE_READLINE
T> + select BR2_PACKAGE_LIBNL
T> + help
T> + Dropwatch is an interactive utility for monitoring and recording packets
T> + that are dropped by the kernel
Line too long. It should be wrapped around column 70 to fit menuconfig
in a normal 80x24 terminal.
T> +++ b/package/dropwatch/dropwatch.mk
T> @@ -0,0 +1,30 @@
T> +################################################################################
T> +#
T> +# dropwatch
T> +#
T> +################################################################################
T> +
T> +DROPWATCH_VERSION = 1.4
T> +DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.bz2
T> +DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot/
T> +DROPWATCH_DEPENDENCIES = binutils libnl readline
It uses pkg-config to find the libnl headers, so you also need
host-pkgconf.
T> +DROPWATCH_LICENSE = GPLv2+
main.c explicitly says GPLv2, and the only reference to the typical 'any
later version' is in COPYING, so it should be GPLv2
T> +DROPWATCH_LICENSE_FILE = COPYING
The variable is called ..FILES (S at the end).
Committed with these fixes, thanks.
diff --git a/package/Config.in b/package/Config.in index b8011c7..1216450 100644 --- a/package/Config.in +++ b/package/Config.in @@ -22,6 +22,7 @@ source "package/cache-calibrator/Config.in" source "package/dhrystone/Config.in" source "package/dstat/Config.in" source "package/dmalloc/Config.in" +source "package/dropwatch/Config.in" source "package/gdb/Config.in" source "package/iozone/Config.in" source "package/kexec/Config.in" diff --git a/package/dropwatch/Config.in b/package/dropwatch/Config.in new file mode 100644 index 0000000..c7fc933 --- /dev/null +++ b/package/dropwatch/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_DROPWATCH + bool "dropwatch" + select BR2_PACKAGE_BINUTILS + select BR2_PACKAGE_READLINE + select BR2_PACKAGE_LIBNL + help + Dropwatch is an interactive utility for monitoring and recording packets + that are dropped by the kernel + + https://fedorahosted.org/dropwatch/ diff --git a/package/dropwatch/dropwatch-1.4-build.patch b/package/dropwatch/dropwatch-1.4-build.patch new file mode 100644 index 0000000..eed43e8 --- /dev/null +++ b/package/dropwatch/dropwatch-1.4-build.patch @@ -0,0 +1,27 @@ +From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001 +From: Tzu-Jung Lee <tjlee@ambarella.com> +Date: Fri, 12 Jul 2013 20:00:57 +0800 +Subject: [PATCH] build: modify hardcoded gcc to support buildroot + +Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com> + +diff --git a/src/Makefile b/src/Makefile +index 026b6ba..b87ae9f 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -5,10 +5,10 @@ OBJFILES := main.o lookup.o\ + lookup_bfd.o lookup_kas.o + + dropwatch: $(OBJFILES) +- gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) ++ $(CC) -g -o dropwatch $(OBJFILES) $(LDFLAGS) + + %.o: %.c +- gcc $(CFLAGS) $< ++ $(CC) $(CFLAGS) $< + clean: + rm -f dropwatch *.o + +-- +1.8.3.2 + diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk new file mode 100644 index 0000000..549e3bb --- /dev/null +++ b/package/dropwatch/dropwatch.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# dropwatch +# +################################################################################ + +DROPWATCH_VERSION = 1.4 +DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.bz2 +DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot/ +DROPWATCH_DEPENDENCIES = binutils libnl readline +DROPWATCH_LICENSE = GPLv2+ +DROPWATCH_LICENSE_FILE = COPYING + +define DROPWATCH_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) build +endef + +define DROPWATCH_CLEAN_CMDS + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean +endef + +define DROPWATCH_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/src/dropwatch $(TARGET_DIR)/usr/bin/dropwatch +endef + +define DROPWATCH_UNINSTALL_CMDS + rm -f $(TARGET_DIR)/usr/bin/dropwatch +endef + +$(eval $(generic-package))
Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com> --- v3 adopts all the review comments against v2 from Peter. package/Config.in | 1 + package/dropwatch/Config.in | 10 ++++++++++ package/dropwatch/dropwatch-1.4-build.patch | 27 ++++++++++++++++++++++++++ package/dropwatch/dropwatch.mk | 30 +++++++++++++++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 package/dropwatch/Config.in create mode 100644 package/dropwatch/dropwatch-1.4-build.patch create mode 100644 package/dropwatch/dropwatch.mk