From: Clemens Gruber <clemens.gruber@pqgruber.com>
To: ptxdist@pengutronix.de
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Subject: [ptxdist] [PATCH] iproute2: update version and minor improvements
Date: Mon, 26 Sep 2016 21:33:32 +0200 [thread overview]
Message-ID: <20160926193336.11772-1-clemens.gruber@pqgruber.com> (raw)
Update to iproute2 4.7.0, which includes Alexander Aring's patch to fix
the xtables build failure.
Replaced the description of tc with some (modified) lines from the
manpage.
Let libmng be used if it is enabled in ptxdist.
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
---
rules/iproute2.in | 5 +++--
rules/iproute2.make | 10 +++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/rules/iproute2.in b/rules/iproute2.in
index dadad03..888b595 100644
--- a/rules/iproute2.in
+++ b/rules/iproute2.in
@@ -135,7 +135,8 @@ config IPROUTE2_TC
bool
prompt "tc"
help
- In Quality Of Service (QOS) and Class Of Service (COS)
- scenarios used for traffic controlling
+ tc is used to configure Traffic Control in the Linux Kernel, which
+ consists of Shaping, Scheduling, Policing and Dropping.
+ Processing of traffic is controlled by qdiscs, classes and filters.
endif
diff --git a/rules/iproute2.make b/rules/iproute2.make
index 9e9e899..8e62f8f 100644
--- a/rules/iproute2.make
+++ b/rules/iproute2.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
#
# Paths and names
#
-IPROUTE2_VERSION := 4.6.0
-IPROUTE2_MD5 := d015e437e4f744d51d3a1a53341826d5
+IPROUTE2_VERSION := 4.7.0
+IPROUTE2_MD5 := d4b205830cdc2702f8a0cbd6232129cd
IPROUTE2 := iproute2-$(IPROUTE2_VERSION)
IPROUTE2_SUFFIX := tar.xz
IPROUTE2_URL := $(call ptx/mirror, KERNEL, utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
@@ -46,7 +46,9 @@ $(STATEDIR)/iproute2.prepare:
ifndef PTXCONF_GLOBAL_SELINUX
@echo 'HAVE_SELINUX:=n' >> $(IPROUTE2_DIR)/Config
endif
+ifndef PTXCONF_LIBMNL
@echo 'HAVE_MNL:=n' >> $(IPROUTE2_DIR)/Config
+endif
ifndef PTXCONF_IPROUTE2_ARPD
@echo 'HAVE_BERKELEY_DB:=n' >> $(IPROUTE2_DIR)/Config
endif
@@ -97,18 +99,20 @@ $(STATEDIR)/iproute2.targetinstall:
done
ifdef PTXCONF_IPROUTE2_TC
+ @$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/normal.dist)
@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/pareto.dist)
@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/paretonormal.dist)
@$(call install_copy, iproute2, 0, 0, 0644, -, /usr/lib/tc/experimental.dist)
endif
@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/ematch_map)
+ @$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/group)
+ @$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/nl_protos)
@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_dsfield)
@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_protos)
@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_realms)
@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_scopes)
@$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/rt_tables)
- @$(call install_alternative, iproute2, 0, 0, 0644, /etc/iproute2/group)
@$(call install_finish, iproute2)
--
2.10.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2016-09-26 19:34 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 19:33 Clemens Gruber [this message]
2016-09-26 19:33 ` [ptxdist] [PATCH] libfastjson: new package Clemens Gruber
2016-09-27 6:32 ` Michael Olbrich
2016-09-26 19:33 ` [ptxdist] [PATCH] rsyslog: major update Clemens Gruber
2016-09-27 6:37 ` Michael Olbrich
2016-09-27 12:35 ` Clemens Gruber
2016-09-27 17:54 ` Ladislav Michl
2016-09-28 8:59 ` Michael Olbrich
2016-09-28 9:23 ` Clemens Gruber
2016-09-26 19:33 ` [ptxdist] [PATCH] procps-ng: bump version Clemens Gruber
2016-09-26 19:33 ` [ptxdist] [PATCH] e2fsprogs: " Clemens Gruber
2016-09-28 8:56 ` [ptxdist] [PATCH] iproute2: update version and minor improvements Michael Olbrich
2016-09-28 9:17 ` Clemens Gruber
2016-09-28 9:26 ` Clemens Gruber
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=20160926193336.11772-1-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