summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2.inc16
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch31
-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"
18PACKAGECONFIG ??= "tipc" 18PACKAGECONFIG ??= "tipc"
19PACKAGECONFIG[tipc] = ",,libmnl," 19PACKAGECONFIG[tipc] = ",,libmnl,"
20 20
21EXTRA_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}'" 21EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \
22 ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
22 23
23do_configure_append () { 24do_configure_append () {
24 sh configure ${STAGING_INCDIR} 25 sh configure ${STAGING_INCDIR}
@@ -37,10 +38,19 @@ do_install () {
37# The .so files in iproute2-tc are modules, not traditional libraries 38# The .so files in iproute2-tc are modules, not traditional libraries
38INSANE_SKIP_${PN}-tc = "dev-so" 39INSANE_SKIP_${PN}-tc = "dev-so"
39 40
40PACKAGES =+ "${PN}-tc ${PN}-lnstat ${PN}-ifstat ${PN}-genl ${PN}-rtacct ${PN}-nstat ${PN}-ss ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}" 41PACKAGES =+ "${PN}-tc \
42 ${PN}-lnstat \
43 ${PN}-ifstat \
44 ${PN}-genl \
45 ${PN}-rtacct \
46 ${PN}-nstat \
47 ${PN}-ss \
48 ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}"
41FILES_${PN}-tc = "${base_sbindir}/tc* \ 49FILES_${PN}-tc = "${base_sbindir}/tc* \
42 ${libdir}/tc/*.so" 50 ${libdir}/tc/*.so"
43FILES_${PN}-lnstat = "${base_sbindir}/lnstat ${base_sbindir}/ctstat ${base_sbindir}/rtstat" 51FILES_${PN}-lnstat = "${base_sbindir}/lnstat \
52 ${base_sbindir}/ctstat \
53 ${base_sbindir}/rtstat"
44FILES_${PN}-ifstat = "${base_sbindir}/ifstat" 54FILES_${PN}-ifstat = "${base_sbindir}/ifstat"
45FILES_${PN}-genl = "${base_sbindir}/genl" 55FILES_${PN}-genl = "${base_sbindir}/genl"
46FILES_${PN}-rtacct = "${base_sbindir}/rtacct" 56FILES_${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 @@
1From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 1From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net> 2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 3 Nov 2011 10:46:16 +0100 3Date: Sun, 31 Mar 2019 17:32:07 +0200
4Subject: [PATCH] make configure cross compile safe 4Subject: [PATCH] make configure cross compile safe
5 5
6According to Kevin Tian: 6According to Kevin Tian:
@@ -9,11 +9,15 @@ Upstream-Status: Pending
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> 9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10Signed-off-by: Shane Wang <shane.wang@intel.com> 10Signed-off-by: Shane Wang <shane.wang@intel.com>
11 11
12Index: iproute2-4.14.1/configure 12---
13=================================================================== 13 configure | 3 ++-
14--- iproute2-4.14.1.orig/configure 14 1 file changed, 2 insertions(+), 1 deletion(-)
15+++ iproute2-4.14.1/configure 15
16@@ -2,6 +2,7 @@ 16diff --git a/configure b/configure
17index 45fcffb6..0c5c9146 100755
18--- a/configure
19+++ b/configure
20@@ -3,6 +3,7 @@
17 # This is not an autoconf generated configure 21 # This is not an autoconf generated configure
18 # 22 #
19 INCLUDE=${1:-"$PWD/include"} 23 INCLUDE=${1:-"$PWD/include"}
@@ -21,12 +25,15 @@ Index: iproute2-4.14.1/configure
21 25
22 # Output file which is input to Makefile 26 # Output file which is input to Makefile
23 CONFIG=config.mk 27 CONFIG=config.mk
24@@ -195,7 +196,7 @@ check_ipt_lib_dir() 28@@ -162,7 +163,7 @@ check_ipt_lib_dir()
25 return 29 return
26 fi 30 fi
27 31
28- for dir in /lib /usr/lib /usr/local/lib 32- for dir in /lib /usr/lib /usr/local/lib; do
29+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib 33+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib; do
30 do 34 for file in "xtables" "iptables"; do
31 for file in $dir/{xtables,iptables}/lib*t_*so ; do 35 file="$dir/$file/lib*t_*so"
32 if [ -f $file ]; then 36 if [ -f $file ]; then
37--
382.17.1
39
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 \
6 file://0001-ip-Remove-unneed-header.patch \ 6 file://0001-ip-Remove-unneed-header.patch \
7 " 7 "
8 8
9SRC_URI[md5sum] = "67eeebacaac4515cab73dfd2fc796af3" 9SRC_URI[md5sum] = "d22107b4d7cfb999eeb8ad8a0aec1124"
10SRC_URI[sha256sum] = "d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984" 10SRC_URI[sha256sum] = "df047302a39650ef832c07e8dab5df7a23218cd398bd310c8628e386161d20ba"
11 11
12# CFLAGS are computed in Makefile and reference CCOPTS 12# CFLAGS are computed in Makefile and reference CCOPTS
13# 13#