From patchwork Sat Jun 17 07:27:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Dahl X-Patchwork-Id: 777291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wqTYG23vvz9sBR for ; Sat, 17 Jun 2017 17:35:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 83BF62FCD6; Sat, 17 Jun 2017 07:35:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tl37xcpzUwUk; Sat, 17 Jun 2017 07:35:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5FD342B076; Sat, 17 Jun 2017 07:35:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1346C1C40B6 for ; Sat, 17 Jun 2017 07:35:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0C29E2B076 for ; Sat, 17 Jun 2017 07:35:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nr4sxgyREVLW for ; Sat, 17 Jun 2017 07:35:20 +0000 (UTC) X-Greylist: delayed 00:05:40 by SQLgrey-1.7.6 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.73]) by silver.osuosl.org (Postfix) with ESMTPS id E12E925D87 for ; Sat, 17 Jun 2017 07:35:19 +0000 (UTC) Received: from idefix.home.lespocky.de ([80.129.194.10]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MSrBt-1dCTfd0tEb-00Rtmd; Sat, 17 Jun 2017 09:28:28 +0200 Received: from falbala.home.lespocky.de ([192.168.243.94]) by idefix.home.lespocky.de with esmtpa (Exim 4.82) (envelope-from ) id 1dM89Y-0006DO-Ki; Sat, 17 Jun 2017 09:28:26 +0200 Received: by falbala.home.lespocky.de (sSMTP sendmail emulation); Sat, 17 Jun 2017 09:28:16 +0200 From: Alexander Dahl To: buildroot@buildroot.org Date: Sat, 17 Jun 2017 09:27:26 +0200 Message-Id: <1497684446-18637-1-git-send-email-post@lespocky.de> X-Mailer: git-send-email 2.1.4 X-Scan-Signature: ec0324ac676f3237a8b0df452bcb17d2 X-Provags-ID: V03:K0:ehyUKq21xjPnS5caRh+FctijFqxiYcSy5GJ1AWA+7VvGGGqKlnx CtzL5O5T+46hABwOORYZKBM9w/CpHbmK8JuRC5OauoXrlnhPBy9pu3JECowwHCCNuOnsoJ6 tzTX/60+9VYriL9kSfoYJE1FF7+CX6BtXxlUqfS1qdE8xYVpKPA6Pmf+ltpzJp/bicn3hx3 lvbwkMdXFN/i9+d8yL1LQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:UhTJWRNsaU0=:xq6l/BCdtl2OBjg4Y6mqY0 KxJFQ9ZELipK2UhL22g3Y5uswULi070tqndK9sMiUcNBZmOS/yzxQpOYwf67uqbkNGoS0BsfY C6Ll+dyVH+iujynKYdSOgUcIANSJkA7qPD3XDCdqUHQzVONTYjpfvwjKHN8OU69blesDiXPEe uZdbn+OfmSxJ4TPpfG9rZY+QvHBZbSdleqNW75rKEh984jCXVq9VKGdKajPH0blV/hVK10Quy VIQ97Q+RhJl+Mw0WzmY5ffx+pzNDjXAhj/oGGmsetBVaElSKbAZAcAlrU/Or6+7w9CHDbyunF CKeRXbKSSwadH/Ut569fqrF1kJXvUDuE7OD/7fz44+4OHHzq6yTG9XXUq4BB1f5XMTRx8NnVi 3KeP0c1pJT8nMl1t7WtJ+dJ/SFUo13MWH086kUirZpqchRbM7wSu5+i3tyClUjUcKEEAhYL8j UJ9zaIss2B4LoRqqr+JG2maxaZIp9rNbChGJRBetDlYC6p0kC0Hfll84R6D1FQxgeICnPhlG3 9SYBsoUS//taI2/QsThsX1R+7AY306HKU52ksJ5TnWoXAlQViji4DjB4YuWrvpxK22ND3aU0s UqVCANxr8qAm8iuQPOT9jRrV+X9qIV28Rc2GcJUYsyGKm6cvLtwzqLTgZqaaBR0sPlO1CJkIr KFzQSDgOhsZpoerCh5zSHJfmzr8u5XlEkwnVZBZqxTo9KMP1DkvgYmsJzTIN34sEC1C0= Cc: Alexander Dahl , Neil Horman Subject: [Buildroot] [PATCH] dropwatch: bump to master and fix site X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The tool was hosted at fedorahosted.org which was shut down in early 2017. According to a private conversation with the upstream maintainer, the new home for this tool is on infradead.org so far. So the SITE was adapted accordingly. Additionally the version was bumped from 1.4 to current master. This allows to drop one build patch. The other patches were recreated with Git. Cc: Neil Horman Signed-off-by: Alexander Dahl --- ...ils-2.23.1.patch => 0001-binutils-2.23.1.patch} | 60 ++++++++++++++-------- package/dropwatch/0001-build.patch | 27 ---------- package/dropwatch/0002-remove-werror.patch | 31 +++++++++++ package/dropwatch/0003-remove-werror.patch | 18 ------- package/dropwatch/dropwatch.hash | 2 +- package/dropwatch/dropwatch.mk | 5 +- 6 files changed, 73 insertions(+), 70 deletions(-) rename package/dropwatch/{0002-binutils-2.23.1.patch => 0001-binutils-2.23.1.patch} (59%) delete mode 100644 package/dropwatch/0001-build.patch create mode 100644 package/dropwatch/0002-remove-werror.patch delete mode 100644 package/dropwatch/0003-remove-werror.patch diff --git a/package/dropwatch/0002-binutils-2.23.1.patch b/package/dropwatch/0001-binutils-2.23.1.patch similarity index 59% rename from package/dropwatch/0002-binutils-2.23.1.patch rename to package/dropwatch/0001-binutils-2.23.1.patch index 4d43356..8790051 100644 --- a/package/dropwatch/0002-binutils-2.23.1.patch +++ b/package/dropwatch/0001-binutils-2.23.1.patch @@ -1,12 +1,24 @@ +From c89cc908ba7f9f41aba4f61f58103d0fc64fa19f Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias +Date: Fri, 16 Jun 2017 08:50:03 +0200 +Subject: [PATCH 1/2] 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 +--- + 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 -aurd src.orig/lookup.c src/lookup.c ---- a/src/lookup.c 2011-10-03 22:51:38.000000000 +0400 -+++ b/src/lookup.c 2013-02-18 09:13:56.683214438 +0400 +diff --git a/src/lookup.c b/src/lookup.c +index ba54991..809981b 100644 +--- a/src/lookup.c ++++ b/src/lookup.c @@ -27,13 +27,13 @@ #include #include @@ -16,28 +28,30 @@ diff -aurd src.orig/lookup.c src/lookup.c #include #include #include - + #include "lookup.h" +#include - + extern struct lookup_methods bfd_methods; extern struct lookup_methods kallsym_methods; -diff -aurd src.orig/lookup.h src/lookup.h ---- a/src/lookup.h 2011-10-03 22:51:38.000000000 +0400 -+++ b/src/lookup.h 2013-02-18 09:11:00.506895026 +0400 +diff --git a/src/lookup.h b/src/lookup.h +index e6568d8..47a7b56 100644 +--- a/src/lookup.h ++++ b/src/lookup.h @@ -28,6 +28,9 @@ #include #include - + +// satisfy PR 14072 in bfd.h +#define PACKAGE 1 +#define PACKAGE_VERSION 1 - + /* * Initalization routine -diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c ---- a/src/lookup_bfd.c 2012-01-16 22:34:11.000000000 +0400 -+++ b/src/lookup_bfd.c 2013-02-18 09:14:02.472984310 +0400 +diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c +index cc7010b..271d426 100644 +--- a/src/lookup_bfd.c ++++ b/src/lookup_bfd.c @@ -25,13 +25,13 @@ #include #include @@ -47,15 +61,16 @@ diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c #include #include #include - + #include "lookup.h" +#include - - + + static int lookup_bfd_init(void) -diff -aurd src.orig/lookup_kas.c src/lookup_kas.c ---- a/src/lookup_kas.c 2012-05-31 02:43:23.000000000 +0400 -+++ b/src/lookup_kas.c 2013-02-18 09:14:07.906101713 +0400 +diff --git a/src/lookup_kas.c b/src/lookup_kas.c +index 16e639f..556cb62 100644 +--- a/src/lookup_kas.c ++++ b/src/lookup_kas.c @@ -25,7 +25,6 @@ #include #include @@ -66,9 +81,12 @@ diff -aurd src.orig/lookup_kas.c src/lookup_kas.c #include @@ -33,6 +32,7 @@ #include - + #include "lookup.h" +#include - + struct symbol_entry { char *sym_name; +-- +2.1.4 + diff --git a/package/dropwatch/0001-build.patch b/package/dropwatch/0001-build.patch deleted file mode 100644 index eed43e8..0000000 --- a/package/dropwatch/0001-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001 -From: Tzu-Jung Lee -Date: Fri, 12 Jul 2013 20:00:57 +0800 -Subject: [PATCH] build: modify hardcoded gcc to support buildroot - -Signed-off-by: Tzu-Jung Lee - -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/0002-remove-werror.patch b/package/dropwatch/0002-remove-werror.patch new file mode 100644 index 0000000..8006550 --- /dev/null +++ b/package/dropwatch/0002-remove-werror.patch @@ -0,0 +1,31 @@ +From 2462baf55939ee53bb28ff5f9474761f2a888add Mon Sep 17 00:00:00 2001 +From: Markos Chandras +Date: Fri, 16 Jun 2017 08:53:31 +0200 +Subject: [PATCH 2/2] remove werror + +-Werror shouldn't be used in released code since it can +cause random build failures on moderate warnings. It also +depends on the used toolchain since different toolchains may +or may not print the same warnings. + +Signed-off-by: Markos Chandras +--- + src/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Makefile b/src/Makefile +index 5bc6aaa..527c1da 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1,7 +1,7 @@ + all: dropwatch + + CPPFLAGS += -D_GNU_SOURCE +-CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0) ++CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0) + LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3 + + OBJFILES := main.o lookup.o\ +-- +2.1.4 + diff --git a/package/dropwatch/0003-remove-werror.patch b/package/dropwatch/0003-remove-werror.patch deleted file mode 100644 index 97b26b7..0000000 --- a/package/dropwatch/0003-remove-werror.patch +++ /dev/null @@ -1,18 +0,0 @@ --Werror shouldn't be used in released code since it can -cause random build failures on moderate warnings. It also -depends on the used toolchain since different toolchains may -or may not print the same warnings. - -Signed-off-by: Markos Chandras - -Index: dropwatch-1.4/src/Makefile -=================================================================== ---- dropwatch-1.4.orig/src/Makefile -+++ dropwatch-1.4/src/Makefile -@@ -1,5 +1,5 @@ - all: dropwatch --CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0` -+CFLAGS+=-c -g -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0` - LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3 - OBJFILES := main.o lookup.o\ - lookup_bfd.o lookup_kas.o diff --git a/package/dropwatch/dropwatch.hash b/package/dropwatch/dropwatch.hash index 3f15c84..585b035 100644 --- a/package/dropwatch/dropwatch.hash +++ b/package/dropwatch/dropwatch.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c2348b8d72781ab0f3ca52b8415d78ea98808280e14e7d68e76605f196bb5c4a dropwatch-1.4.tar.xz +sha256 4937007da3d0071c9a37ee0360cfd1657b342fd2a327d83ba992fbf3e0ea51b5 dropwatch-7c33d8a8ed105b07a46b55d71d93b36ed34c16db.tar.gz diff --git a/package/dropwatch/dropwatch.mk b/package/dropwatch/dropwatch.mk index a037d3f..bb91fd7 100644 --- a/package/dropwatch/dropwatch.mk +++ b/package/dropwatch/dropwatch.mk @@ -4,9 +4,8 @@ # ################################################################################ -DROPWATCH_VERSION = 1.4 -DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.xz -DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot +DROPWATCH_VERSION = 7c33d8a8ed105b07a46b55d71d93b36ed34c16db +DROPWATCH_SITE = git://git.infradead.org/users/nhorman/dropwatch.git DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf DROPWATCH_LICENSE = GPL-2.0 DROPWATCH_LICENSE_FILES = COPYING