From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH 08/18] iproute2: update 4.8.0 -> 4.9.0
Date: Mon, 19 Dec 2016 21:36:21 +0100 [thread overview]
Message-ID: <20161219203631.29275-9-clemens.gruber@pqgruber.com> (raw)
In-Reply-To: <20161219203631.29275-1-clemens.gruber@pqgruber.com>
Our workaround for the iptables dependency problem is no longer
necessary due to the new option TC_CONFIG_NO_XT.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
.../0001-add-xtables-version.h.patch | 22 ----------------------
patches/iproute2-4.8.0/series | 1 -
rules/iproute2.make | 7 +++----
3 files changed, 3 insertions(+), 27 deletions(-)
delete mode 100644 patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
delete mode 100644 patches/iproute2-4.8.0/series
diff --git a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch b/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
deleted file mode 100644
index fe9ba7ac0..000000000
--- a/patches/iproute2-4.8.0/0001-add-xtables-version.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 4d90bfff717bd7be913832c7eaefd5b5f7408012 Mon Sep 17 00:00:00 2001
-From: Clemens Gruber <clemens.gruber@pqgruber.com>
-Date: Mon, 17 Oct 2016 17:06:20 +0200
-Subject: [PATCH] add xtables-version.h
-
-Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
----
- include/xtables-version.h | 2 ++
- 1 file changed, 2 insertions(+)
- create mode 100644 include/xtables-version.h
-
-diff --git a/include/xtables-version.h b/include/xtables-version.h
-new file mode 100644
-index 000000000000..905e5fe070e7
---- /dev/null
-+++ b/include/xtables-version.h
-@@ -0,0 +1,2 @@
-+#define XTABLES_VERSION "libxtables.so.11"
-+#define XTABLES_VERSION_CODE 11
---
-2.10.0
-
diff --git a/patches/iproute2-4.8.0/series b/patches/iproute2-4.8.0/series
deleted file mode 100644
index b705ae7cf..000000000
--- a/patches/iproute2-4.8.0/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-add-xtables-version.h.patch
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 674894c40..946247c3d 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
#
# Paths and names
#
-IPROUTE2_VERSION := 4.8.0
-IPROUTE2_MD5 := 54c6411863cb16a4375aa5f788dca767
+IPROUTE2_VERSION := 4.9.0
+IPROUTE2_MD5 := 44a8371a4b2c40e48e4c9f98cbd41391
IPROUTE2 := iproute2-$(IPROUTE2_VERSION)
IPROUTE2_SUFFIX := tar.xz
IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
@@ -38,8 +38,7 @@ $(STATEDIR)/iproute2.prepare:
@$(call world/prepare, IPROUTE2)
# overwrite options we don't want, or may be misdetected
@echo 'TC_CONFIG_ATM:=n' >> $(IPROUTE2_DIR)/Config
- @echo 'TC_CONFIG_XT:=n' >> $(IPROUTE2_DIR)/Config
- @echo 'IPT_LIB_DIR:=/usr/lib' >> $(IPROUTE2_DIR)/Config
+ @echo 'TC_CONFIG_NO_XT:=y' >> $(IPROUTE2_DIR)/Config
@echo 'TC_CONFIG_ELF:=n' >> $(IPROUTE2_DIR)/Config
ifndef PTXCONF_GLOBAL_SELINUX
@echo 'HAVE_SELINUX:=n' >> $(IPROUTE2_DIR)/Config
--
2.11.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2016-12-19 20:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-19 20:36 [ptxdist] [PATCH 00/18] Patchset for ptxdist Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 01/18] nettle: update 2.7.1 -> 3.3 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 02/18] iputils: update s20121221 -> s20161105 Clemens Gruber
2017-01-05 15:45 ` Michael Olbrich
2016-12-19 20:36 ` [ptxdist] [PATCH 03/18] collectd: update 5.4.1 -> 5.7.0 and add sensors support Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 04/18] dbus: bump version 1.10.10 -> 1.10.14 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 05/18] file: update 5.24 -> 5.29 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 06/18] glib: bump version 2.50.1 -> 2.50.2 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 07/18] iperf: update 2.0.5 -> 2.0.9 Clemens Gruber
2016-12-19 20:36 ` Clemens Gruber [this message]
2016-12-19 20:36 ` [ptxdist] [PATCH 09/18] projectroot: Fix HTML syntax in examples Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 10/18] rrdtool: update 1.4.9 -> 1.6.0 and make more modular Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 11/18] sqlite: update 3.14.1 -> 3.15.2 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 12/18] systemd-bootchart: bump version 230 -> 231 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 13/18] tmux: update 1.9a -> 2.3 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 14/18] u-boot-tools: bump version 2016.07 -> 2016.11 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 15/18] util-linux-ng: update 2.28.2 -> 2.29 and fix URL deduction Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 16/18] picocom: bump version 1.7 -> 2.2 Clemens Gruber
2016-12-19 20:36 ` [ptxdist] [PATCH 17/18] libgcrypt: update 1.7.3 -> 1.7.5 Clemens Gruber
2017-01-05 16:26 ` Michael Olbrich
2016-12-19 20:36 ` [ptxdist] [PATCH 18/18] netperf: new package Clemens Gruber
2017-01-05 16:50 ` [ptxdist] [PATCH 00/18] Patchset for ptxdist Michael Olbrich
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=20161219203631.29275-9-clemens.gruber@pqgruber.com \
--to=clemens.gruber@pqgruber.com \
--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