diff options
author | Clemens Gruber <clemens.gruber@pqgruber.com> | 2016-08-27 17:10:39 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-09-02 14:17:00 +0200 |
commit | fbebd807b7e3a9b6090af2f047256af2d56e3611 (patch) | |
tree | 87850d470c9c357412dd879fa6a1286dd6b7ceb4 | |
parent | 4d4306a6c6adc412355559b462b09493c4ae0ba7 (diff) | |
download | ptxdist-fbebd807b7e3a9b6090af2f047256af2d56e3611.tar.gz ptxdist-fbebd807b7e3a9b6090af2f047256af2d56e3611.tar.xz |
libnl3: update to 3.2.28
Add all CLI utils and new libraries.
Use Thomas Haller's GitHub Repo as new versions are no longer uploaded
to infradead.org
Also, the utils install directory changed from /usr/sbin to /usr/bin
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | rules/libnl3.make | 48 |
1 files changed, 43 insertions, 5 deletions
diff --git a/rules/libnl3.make b/rules/libnl3.make index 992c08912..e92759661 100644 --- a/rules/libnl3.make +++ b/rules/libnl3.make @@ -16,11 +16,12 @@ PACKAGES-$(PTXCONF_LIBNL3) += libnl3 # # Paths and names # -LIBNL3_VERSION := 3.2.25 -LIBNL3_MD5 := 03f74d0cd5037cadc8cdfa313bbd195c +LIBNL3_VERSION := 3.2.28 +LIBNL3_MD5 := bab12db1eb94a42129f712a44be91a67 LIBNL3 := libnl-$(LIBNL3_VERSION) +LIBNL3_RELEASE := libnl$(subst .,_,$(LIBNL3_VERSION)) LIBNL3_SUFFIX := tar.gz -LIBNL3_URL := http://www.infradead.org/~tgr/libnl/files/$(LIBNL3).$(LIBNL3_SUFFIX) +LIBNL3_URL := https://github.com/thom311/libnl/releases/download/$(LIBNL3_RELEASE)/$(LIBNL3).$(LIBNL3_SUFFIX) LIBNL3_SOURCE := $(SRCDIR)/$(LIBNL3).$(LIBNL3_SUFFIX) LIBNL3_DIR := $(BUILDDIR)/$(LIBNL3) LIBNL3_LICENSE := GPL-2.0 @@ -43,18 +44,51 @@ LIBNL3_CONF_OPT := \ LIBNL3_INSTALL_FILES-y = LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=genl-ctrl-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=idiag-socket-details +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-ct-add +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-ct-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-exp-add +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-exp-delete +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-exp-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-log +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-monitor +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nf-queue +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-addr-add +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-addr-delete +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-addr-list LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-class-add LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-class-delete -LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-classid-lookup LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-class-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-classid-lookup LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-cls-add LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-cls-delete LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-cls-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-fib-lookup +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-enslave +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-ifindex2name LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-name2ifindex +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-release +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-set +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-link-stats +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-list-caches +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-list-sockets +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-monitor +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-neigh-add +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-neigh-delete +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-neigh-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-neightbl-list LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-pktloc-lookup LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-qdisc-add LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-qdisc-delete LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-qdisc-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-route-add +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-route-delete +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-route-get +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-route-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-rule-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-tctree-list +LIBNL3_INSTALL_FILES-$(PTXCONF_LIBNL3_ENABLE_CLI) +=nl-util-addr $(STATEDIR)/libnl3.targetinstall: @$(call targetinfo) @@ -70,6 +104,7 @@ $(STATEDIR)/libnl3.targetinstall: @$(call install_lib, libnl3, 0, 0, 0644, libnl-idiag-3) @$(call install_lib, libnl3, 0, 0, 0644, libnl-nf-3) @$(call install_lib, libnl3, 0, 0, 0644, libnl-route-3) + @$(call install_lib, libnl3, 0, 0, 0644, libnl-xfrm-3) ifdef PTXCONF_LIBNL3_ENABLE_CLI @$(call install_lib, libnl3, 0, 0, 0644, libnl-cli-3) @@ -77,13 +112,16 @@ ifdef PTXCONF_LIBNL3_ENABLE_CLI @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/cls/cgroup) @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/bfifo) @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/blackhole) + @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/fq_codel) + @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/hfsc) @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/htb) + @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/ingress) @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/pfifo) @$(call install_lib, libnl3, 0, 0, 0644, libnl/cli/qdisc/plug) endif @$(foreach tool,$(LIBNL3_INSTALL_FILES-y), \ - $(call install_copy, libnl3, 0, 0, 0755, -, /usr/sbin/$(tool));) + $(call install_copy, libnl3, 0, 0, 0755, -, /usr/bin/$(tool));) @$(call install_alternative, libnl3, 0, 0, 0644, /etc/libnl/classid) @$(call install_alternative, libnl3, 0, 0, 0644, /etc/libnl/pktloc) |