From: Markus Pargmann <mpa@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Markus Pargmann <mpa@pengutronix.de>
Subject: [ptxdist] [PATCH 1/8] iproute2: version bump 3.9.0 -> 3.14.0
Date: Wed, 30 Apr 2014 11:59:09 +0200 [thread overview]
Message-ID: <1398851956-18885-2-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1398851956-18885-1-git-send-email-mpa@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
.../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 <juergen@kreuzholzen.de>
+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 <juergen@kreuzholzen.de>
+Signed-off-by: Jon Ringle <jon@ringle.org>
+[Rebased to 3.14.0]
+Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
+---
+ 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 <juergen@kreuzholzen.de>
-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 <juergen@kreuzholzen.de>
-Signed-off-by: Jon Ringle <jon@ringle.org>
----
- 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
next prev parent reply other threads:[~2014-04-30 9:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-30 9:59 [ptxdist] [PATCH 0/8] network packages updates Markus Pargmann
2014-04-30 9:59 ` Markus Pargmann [this message]
2014-04-30 9:59 ` [ptxdist] [PATCH 2/8] iw: version bump 3.3 -> 3.14 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 3/8] network: Add batctl Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 4/8] crda: version bump 1.1.3 -> 3.13 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 5/8] dnsmasq: version bump 2.47 -> 2.69 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 6/8] iperf: version bump 2.0.4 -> 2.0.5 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 7/8] wireshark: version bump 1.10.5 -> 1.10.6 Markus Pargmann
2014-04-30 9:59 ` [ptxdist] [PATCH 8/8] libjpeg: version bump 8a -> 9a, add binaries Markus Pargmann
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=1398851956-18885-2-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.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