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 <[email protected]> --- 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 [email protected]
