diff options
author | Anders Roxell <anders.roxell@linaro.org> | 2019-11-07 00:30:53 +0100 |
---|---|---|
committer | Anders Roxell <anders.roxell@linaro.org> | 2019-11-07 00:30:53 +0100 |
commit | cc0313e3896c53bfbef085dad7f016ad1521f51a (patch) | |
tree | 91382d92bb1d9a6594f965fb042c0dc27311749f | |
parent | 9c7bccfaa090bdd0086d2a03c909bbb20c9117fb (diff) |
iproute2: update to v5.2.0
Backport iproute2 from commit 1f9610b3 (iproute2: make elfutils support optional).
Change-Id: I5c4aa9fa4a9b6277a7b8e05c4f1e9c79ec52a940
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
-rw-r--r-- | core/recipes-connectivity/iproute2/iproute2.inc | 25 | ||||
-rw-r--r-- | core/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | 30 | ||||
-rw-r--r-- | core/recipes-connectivity/iproute2/iproute2/configure-cross.patch | 32 | ||||
-rw-r--r-- | core/recipes-connectivity/iproute2/iproute2_5.2.0.bb (renamed from core/recipes-connectivity/iproute2/iproute2_4.17.0.bb) | 6 |
4 files changed, 22 insertions, 71 deletions
diff --git a/core/recipes-connectivity/iproute2/iproute2.inc b/core/recipes-connectivity/iproute2/iproute2.inc index b283589..fc31b84 100644 --- a/core/recipes-connectivity/iproute2/iproute2.inc +++ b/core/recipes-connectivity/iproute2/iproute2.inc @@ -9,16 +9,18 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://ip/ip.c;beginline=3;endline=8;md5=689d691d0410a4b64d3899f8d6e31817" -DEPENDS = "flex-native bison-native iptables elfutils libcap" +DEPENDS = "flex-native bison-native iptables libcap" inherit update-alternatives bash-completion pkgconfig CLEANBROKEN = "1" -PACKAGECONFIG ??= "tipc" +PACKAGECONFIG ??= "tipc elf" PACKAGECONFIG[tipc] = ",,libmnl," +PACKAGECONFIG[elf] = ",,elfutils," -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \ + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" do_configure_append () { sh configure ${STAGING_INCDIR} @@ -37,10 +39,19 @@ do_install () { # The .so files in iproute2-tc are modules, not traditional libraries INSANE_SKIP_${PN}-tc = "dev-so" -PACKAGES =+ "${PN}-tc ${PN}-lnstat ${PN}-ifstat ${PN}-genl ${PN}-rtacct ${PN}-nstat ${PN}-ss ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" +PACKAGES =+ "${PN}-tc \ + ${PN}-lnstat \ + ${PN}-ifstat \ + ${PN}-genl \ + ${PN}-rtacct \ + ${PN}-nstat \ + ${PN}-ss \ + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" FILES_${PN}-tc = "${base_sbindir}/tc* \ ${libdir}/tc/*.so" -FILES_${PN}-lnstat = "${base_sbindir}/lnstat ${base_sbindir}/ctstat ${base_sbindir}/rtstat" +FILES_${PN}-lnstat = "${base_sbindir}/lnstat \ + ${base_sbindir}/ctstat \ + ${base_sbindir}/rtstat" FILES_${PN}-ifstat = "${base_sbindir}/ifstat" FILES_${PN}-genl = "${base_sbindir}/genl" FILES_${PN}-rtacct = "${base_sbindir}/rtacct" @@ -52,3 +63,7 @@ ALTERNATIVE_${PN} = "ip" ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}" ALTERNATIVE_LINK_NAME[ip] = "${base_sbindir}/ip" ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN}-tc = "tc" +ALTERNATIVE_LINK_NAME[tc] = "${base_sbindir}/tc" +ALTERNATIVE_PRIORITY_${PN}-tc = "100" diff --git a/core/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch b/core/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch deleted file mode 100644 index a9027c5..0000000 --- a/core/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae <changhyeok.bae@gmail.com> -Date: Mon, 13 Nov 2017 15:59:35 +0000 -Subject: [PATCH] ip: Remove unneed header - -Fix redefinition of struct ethhdr with a suitably patched musl libc -that suppresses the kernel if_ether.h. - -Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> - -Upstream-Status: Pending [netdev@vger.kernel.org] ---- - ip/iplink_bridge.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c -index cccdec1..f065b22 100644 ---- a/ip/iplink_bridge.c -+++ b/ip/iplink_bridge.c -@@ -13,7 +13,6 @@ - #include <stdlib.h> - #include <string.h> - #include <netinet/in.h> --#include <netinet/ether.h> - #include <linux/if_link.h> - #include <linux/if_bridge.h> - #include <net/if.h> --- -2.7.4 - diff --git a/core/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/core/recipes-connectivity/iproute2/iproute2/configure-cross.patch deleted file mode 100644 index 8b75a2a..0000000 --- a/core/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Thu, 3 Nov 2011 10:46:16 +0100 -Subject: [PATCH] make configure cross compile safe - -According to Kevin Tian: -Upstream-Status: Pending - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> -Signed-off-by: Shane Wang <shane.wang@intel.com> - -Index: iproute2-4.14.1/configure -=================================================================== ---- iproute2-4.14.1.orig/configure -+++ iproute2-4.14.1/configure -@@ -2,6 +2,7 @@ - # This is not an autoconf generated configure - # - INCLUDE=${1:-"$PWD/include"} -+SYSROOT=$1 - - # Output file which is input to Makefile - CONFIG=config.mk -@@ -195,7 +196,7 @@ check_ipt_lib_dir() - return - fi - -- for dir in /lib /usr/lib /usr/local/lib -+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib - do - for file in $dir/{xtables,iptables}/lib*t_*so ; do - if [ -f $file ]; then diff --git a/core/recipes-connectivity/iproute2/iproute2_4.17.0.bb b/core/recipes-connectivity/iproute2/iproute2_5.2.0.bb index 12812b0..1728cd6 100644 --- a/core/recipes-connectivity/iproute2/iproute2_4.17.0.bb +++ b/core/recipes-connectivity/iproute2/iproute2_5.2.0.bb @@ -1,13 +1,11 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://configure-cross.patch \ file://0001-libc-compat.h-add-musl-workaround.patch \ - file://0001-ip-Remove-unneed-header.patch \ " -SRC_URI[md5sum] = "6f3a87fe2d97c28214fc2faab2c257d6" -SRC_URI[sha256sum] = "6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e" +SRC_URI[md5sum] = "0cb2736e7bc2f56254a363d3d23703b7" +SRC_URI[sha256sum] = "a5b95dec26353fc71dba9bb403e9343fad2a06bd69fb154a22a2aa2914f74da8" # CFLAGS are computed in Makefile and reference CCOPTS # |