From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Markus Pargmann Date: Wed, 30 Apr 2014 11:59:09 +0200 Message-Id: <1398851956-18885-2-git-send-email-mpa@pengutronix.de> In-Reply-To: <1398851956-18885-1-git-send-email-mpa@pengutronix.de> References: <1398851956-18885-1-git-send-email-mpa@pengutronix.de> Subject: [ptxdist] [PATCH 1/8] iproute2: version bump 3.9.0 -> 3.14.0 Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Markus Pargmann Signed-off-by: Markus Pargmann --- .../iproute2-3.14.0/0001-build-system-fixes.patch | 39 ++++++++++++++++++++++ patches/iproute2-3.14.0/series | 4 +++ .../iproute2-3.9.0/0001-build-system-fixes.patch | 33 ------------------ patches/iproute2-3.9.0/series | 4 --- rules/iproute2.make | 4 +-- 5 files changed, 45 insertions(+), 39 deletions(-) create mode 100644 patches/iproute2-3.14.0/0001-build-system-fixes.patch create mode 100644 patches/iproute2-3.14.0/series delete mode 100644 patches/iproute2-3.9.0/0001-build-system-fixes.patch delete mode 100644 patches/iproute2-3.9.0/series diff --git a/patches/iproute2-3.14.0/0001-build-system-fixes.patch b/patches/iproute2-3.14.0/0001-build-system-fixes.patch new file mode 100644 index 0000000..1d7a8fe --- /dev/null +++ b/patches/iproute2-3.14.0/0001-build-system-fixes.patch @@ -0,0 +1,39 @@ +From 21ba3bd71071e8d9062e54d52681defd1250c6a9 Mon Sep 17 00:00:00 2001 +From: Juergen Beisert +Date: Sun, 16 Jun 2013 11:17:42 +0200 +Subject: [PATCH] build system fixes + +Build arpd only if the user has requested it. +Add a mechanism to feed in CPPFLAGS for cross builds. + +Signed-off-by: Juergen Beisert +Signed-off-by: Jon Ringle +[Rebased to 3.14.0] +Signed-off-by: Markus Pargmann +--- + misc/Makefile | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/misc/Makefile b/misc/Makefile +index 004bcc3..34af65c 100644 +--- a/misc/Makefile ++++ b/misc/Makefile +@@ -1,10 +1,14 @@ + SSOBJ=ss.o ssfilter.o + LNSTATOBJ=lnstat.o lnstat_util.o + +-TARGETS=ss nstat ifstat rtacct arpd lnstat ++TARGETS=ss nstat ifstat rtacct lnstat + + include ../Config + ++ifdef BUILD_ARPD ++TARGETS += arpd ++endif ++ + ifeq ($(HAVE_SELINUX),y) + LDLIBS += $(shell pkg-config --libs libselinux) + CFLAGS += $(shell pkg-config --cflags libselinux) -DHAVE_SELINUX +-- +1.9.0 + diff --git a/patches/iproute2-3.14.0/series b/patches/iproute2-3.14.0/series new file mode 100644 index 0000000..630efcf --- /dev/null +++ b/patches/iproute2-3.14.0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-build-system-fixes.patch +# 6bd4edb4380a1163a2e685e434917e83 - git-ptx-patches magic diff --git a/patches/iproute2-3.9.0/0001-build-system-fixes.patch b/patches/iproute2-3.9.0/0001-build-system-fixes.patch deleted file mode 100644 index df40efa..0000000 --- a/patches/iproute2-3.9.0/0001-build-system-fixes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Juergen Beisert -Date: Sun, 16 Jun 2013 11:17:42 +0200 -Subject: [PATCH] build system fixes - -Build arpd only if the user has requested it. -Add a mechanism to feed in CPPFLAGS for cross builds. - -Signed-off-by: Juergen Beisert -Signed-off-by: Jon Ringle ---- - misc/Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/misc/Makefile b/misc/Makefile -index a59ff87..4e65239 100644 ---- a/misc/Makefile -+++ b/misc/Makefile -@@ -1,10 +1,14 @@ - SSOBJ=ss.o ssfilter.o - LNSTATOBJ=lnstat.o lnstat_util.o - --TARGETS=ss nstat ifstat rtacct arpd lnstat -+TARGETS=ss nstat ifstat rtacct lnstat - - include ../Config - -+ifdef BUILD_ARPD -+TARGETS += arpd -+endif -+ - all: $(TARGETS) - - ss: $(SSOBJ) diff --git a/patches/iproute2-3.9.0/series b/patches/iproute2-3.9.0/series deleted file mode 100644 index 630efcf..0000000 --- a/patches/iproute2-3.9.0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-build-system-fixes.patch -# 6bd4edb4380a1163a2e685e434917e83 - git-ptx-patches magic diff --git a/rules/iproute2.make b/rules/iproute2.make index 29f3bc2..8c0c4c6 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 # # Paths and names # -IPROUTE2_VERSION := 3.9.0 -IPROUTE2_MD5 := fd9db28e4f411a1e74de65c919ae590f +IPROUTE2_VERSION := 3.14.0 +IPROUTE2_MD5 := bd9d7567bbb987c88120669f5e1a1092 IPROUTE2 := iproute2-$(IPROUTE2_VERSION) IPROUTE2_SUFFIX := tar.xz IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX)) -- 1.9.1 -- ptxdist mailing list ptxdist@pengutronix.de