diff options
| author |   Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> | 2019-03-31 18:55:15 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-12 14:04:50 +0100 |
| commit | 4861becda779e79f0f52c94a0869c9aab9c92a42 (patch) | |
| tree | de9dc09d39e0c858ed168e816c47d6ca1bbae9a1 /meta/recipes-connectivity | |
| parent | b52f80c98d3f6212e9525f9c508bc60d97629fda (diff) | |
| download | openembedded-core-4861becda779e79f0f52c94a0869c9aab9c92a42.tar.gz | |
iproute2: update to 5.0.0
Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2.inc | 16 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb) | 4 |
3 files changed, 34 insertions, 17 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 1aa1eec0de..d72871767f 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -18,7 +18,8 @@ CLEANBROKEN = "1" PACKAGECONFIG ??= "tipc" PACKAGECONFIG[tipc] = ",,libmnl," -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 +38,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" diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch index 8b75a2ada4..b0c4a088fa 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch @@ -1,6 +1,6 @@ -From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 +From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> -Date: Thu, 3 Nov 2011 10:46:16 +0100 +Date: Sun, 31 Mar 2019 17:32:07 +0200 Subject: [PATCH] make configure cross compile safe According to Kevin Tian: @@ -9,11 +9,15 @@ 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 @@ +--- + configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index 45fcffb6..0c5c9146 100755 +--- a/configure ++++ b/configure +@@ -3,6 +3,7 @@ # This is not an autoconf generated configure # INCLUDE=${1:-"$PWD/include"} @@ -21,12 +25,15 @@ Index: iproute2-4.14.1/configure # Output file which is input to Makefile CONFIG=config.mk -@@ -195,7 +196,7 @@ check_ipt_lib_dir() +@@ -162,7 +163,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 +- for dir in /lib /usr/lib /usr/local/lib; do ++ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib; do + for file in "xtables" "iptables"; do + file="$dir/$file/lib*t_*so" if [ -f $file ]; then +-- +2.17.1 + diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb index 6db4062d68..c5ac987b6f 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb @@ -6,8 +6,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://0001-ip-Remove-unneed-header.patch \ " -SRC_URI[md5sum] = "67eeebacaac4515cab73dfd2fc796af3" -SRC_URI[sha256sum] = "d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984" +SRC_URI[md5sum] = "d22107b4d7cfb999eeb8ad8a0aec1124" +SRC_URI[sha256sum] = "df047302a39650ef832c07e8dab5df7a23218cd398bd310c8628e386161d20ba" # CFLAGS are computed in Makefile and reference CCOPTS # |