From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH v2] iproute2: update version and minor improvements
Date: Tue, 4 Oct 2016 16:42:13 +0200 [thread overview]
Message-ID: <20161004144213.o6joyskkg5c2d25d@pengutronix.de> (raw)
In-Reply-To: <20160928155923.20108-1-clemens.gruber@pqgruber.com>
On Wed, Sep 28, 2016 at 05:59:23PM +0200, Clemens Gruber wrote:
> 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.
>
> Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
> ---
>
> Changes from v1:
> - Fixed rebase mistake, can now be applied to ptxdist master
> - Removed the unnecessary libmnl ifdef
>
> rules/iproute2.in | 5 +++--
> rules/iproute2.make | 15 ++++++++++-----
> 2 files changed, 13 insertions(+), 7 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 34f93f4..58701cb 100644
> --- a/rules/iproute2.make
> +++ b/rules/iproute2.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
> #
> # Paths and names
> #
> -IPROUTE2_VERSION := 4.4.0
> -IPROUTE2_MD5 := d762653ec3e1ab0d4a9689e169ca184f
> +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))
> @@ -33,12 +33,14 @@ IPROUTE2_LICENSE := GPL-2.0
> # iproute2's configure is handcrafted and doesn't take standard configure options
> IPROUTE2_CONF_OPT := ''
>
> +
> +
unnecessary white space change.
> $(STATEDIR)/iproute2.prepare:
> @$(call targetinfo)
> @$(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 'TC_CONFIG_XT:=y' >> $(IPROUTE2_DIR)/Config
This is new. Can you add a comment about this to the commit message.
> @echo 'IPT_LIB_DIR:=/usr/lib' >> $(IPROUTE2_DIR)/Config
> @echo 'TC_CONFIG_ELF:=n' >> $(IPROUTE2_DIR)/Config
> ifndef PTXCONF_GLOBAL_SELINUX
> @@ -53,7 +55,8 @@ endif
> IPROUTE2_MAKE_OPT := \
> DESTDIR=$(SYSROOT) \
> LDFLAGS='-rdynamic' \
> - WFLAGS="-Wall"
> + WFLAGS="-Wall" \
> + KERNEL_INCLUDE="$(KERNEL_HEADERS_DIR)/include/"
use $(KERNEL_HEADERS_INCLUDE_DIR) please.
Michael
>
> # ----------------------------------------------------------------------------
> # Target-Install
> @@ -93,18 +96,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
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
prev parent reply other threads:[~2016-10-04 14:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-28 15:59 Clemens Gruber
2016-10-04 14:42 ` Michael Olbrich [this message]
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=20161004144213.o6joyskkg5c2d25d@pengutronix.de \
--to=m.olbrich@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