From patchwork Tue Jan 14 12:34:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 310682 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id A87FB2C00B3 for ; Tue, 14 Jan 2014 23:36:06 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 1121D40564 for ; Tue, 14 Jan 2014 13:36:06 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 7655540558 for ; Tue, 14 Jan 2014 13:35:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=3597; q=dns/txt; s=ironport1; t=1389702906; x=1421238906; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=4bg0hrWP1iAaNh0c+wKoiZDCXDXy74dOWc8FZikMtHc=; b=g7jLZl+0ODYJ9SuAo4WWESzvlNTdpHgd0sn+h9YOnPKWxngvOHuOqFsK VqJbsQTMdvR3KChkgW0e2MJCmKXw4TcasImmeAPv2iAxN88KqdAF0dPId BZKHMf2S+QAe8QdiWxnupshG1lOqkSaCGyyxQZhhLvlNoCytZIXeNddGP k=; X-IronPort-AV: E=Sophos;i="4.95,658,1384297200"; d="scan'208";a="4300255" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 14 Jan 2014 13:35:05 +0100 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Tue, 14 Jan 2014 13:35:04 +0100 Received: by localhost (Postfix, from userid 30007) id 66B21681613; Tue, 14 Jan 2014 12:35:04 +0000 (UTC) From: To: Subject: [PATCH 123/131] iproute2: Remove version 3.8.0 Date: Tue, 14 Jan 2014 12:34:50 +0000 Message-ID: <9af7e1380ced1a3a589947089da32e15034937ab.1389702652.git.christian.braunersorensen@prevas.dk> X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Kim Bøndergaard (cherry picked from commit 0087914c07d2a0794179fcb53179b3a129de5875) --- ...tion-error-of-m_ipt.c-with-Werror-enabled.patch | 44 ---------------------- recipes/iproute2/iproute2_3.8.0.oe | 7 ---- recipes/iproute2/iproute2_3.8.0.oe.sig | 1 - 3 files changed, 52 deletions(-) delete mode 100644 recipes/iproute2/iproute2-3.8.0/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch delete mode 100644 recipes/iproute2/iproute2_3.8.0.oe delete mode 100644 recipes/iproute2/iproute2_3.8.0.oe.sig diff --git a/recipes/iproute2/iproute2-3.8.0/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch b/recipes/iproute2/iproute2-3.8.0/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch deleted file mode 100644 index aa74c67..0000000 --- a/recipes/iproute2/iproute2-3.8.0/0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch +++ /dev/null @@ -1,44 +0,0 @@ - -From 9235195666af7d887771cf557ef2bd3f00b9ecc8 Mon Sep 17 00:00:00 2001 -From: Vijay Subramanian -Date: Tue, 26 Feb 2013 09:12:07 +0000 -Subject: [PATCH] Fix compilation error of m_ipt.c with -Werror enabled - -Commit (5a650703d47e10aa386406c855eff5a593b2120b Makefile: make warnings into -errors ) causes the following build error. - -gcc -Wall -Wstrict-prototypes -Werror -Wmissing-prototypes --Wmissing-declarations -Wold-style-definition -O2 -I../include --DRESOLVE_HOSTNAMES -DLIBDIR=\"/usr/lib\" -DCONFDIR=\"/etc/iproute2\" --D_GNU_SOURCE -DCONFIG_GACT -DCONFIG_GACT_PROB -DIPT_LIB_DIR=\"/lib/xtables\" --DYY_NO_INPUT -c -o m_ipt.o m_ipt.c -cc1: warnings being treated as errors -m_ipt.c:72: error: no previous prototype for 'xtables_register_target' -m_ipt.c:361: error: no previous prototype for 'build_st' -make[1]: *** [m_ipt.o] Error 1 - -This is fixed by adding the prototype in the header include/iptables.h - -I am not sure if this is due to something wrong on my build system but I am -using current glibc 2.17. - -Signed-off-by: Vijay Subramanian ---- - include/iptables.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/iptables.h b/include/iptables.h -index dd844c1..f1e62e2 100644 ---- a/include/iptables.h -+++ b/include/iptables.h -@@ -143,6 +143,8 @@ extern int line; - /* Your shared library should call one of these. */ - extern void register_match(struct iptables_match *me); - extern void register_target(struct iptables_target *me); -+extern void xtables_register_target(struct iptables_target *me); -+extern int build_st(struct iptables_target *target, struct ipt_entry_target *t); - - extern struct in_addr *dotted_to_addr(const char *dotted); - extern char *addr_to_dotted(const struct in_addr *addrp); --- -1.7.9.5 diff --git a/recipes/iproute2/iproute2_3.8.0.oe b/recipes/iproute2/iproute2_3.8.0.oe deleted file mode 100644 index f0cb536..0000000 --- a/recipes/iproute2/iproute2_3.8.0.oe +++ /dev/null @@ -1,7 +0,0 @@ -require iproute2.inc - -SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${PN}-${PV}.tar.bz2 \ - file://0001-Fix-compilation-error-of-m_ipt.c-with-Werror-enabled.patch\ -" - -S="${SRCDIR}/${PN}-${PV}" diff --git a/recipes/iproute2/iproute2_3.8.0.oe.sig b/recipes/iproute2/iproute2_3.8.0.oe.sig deleted file mode 100644 index 6874d05..0000000 --- a/recipes/iproute2/iproute2_3.8.0.oe.sig +++ /dev/null @@ -1 +0,0 @@ -6dfc5f120406406cb23db23d631133ed897313d1 iproute2-3.8.0.tar.bz2