Skip to contentSkip to conversation

iproute2: update to 5.0.0

PATCH Superseded Oleksandr Kravchuk 2 participants 3 messages Mar 31, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iproute2: update to 5.0.0

---
 .../iproute2/iproute2.inc                     | 16 +++++++--
 .../iproute2/iproute2/configure-cross.patch   | 35 ++++++++++---------
 .../{iproute2_4.19.0.bb => iproute2_5.0.0.bb} |  4 +--
 3 files changed, 33 insertions(+), 22 deletions(-)
 rename meta/recipes-connectivity/iproute2/{iproute2_4.19.0.bb => iproute2_5.0.0.bb} (72%)
meta/recipes-connectivity/iproute2/iproute2.inc +13 -3
index 1aa1eec0de..d72871767f 100644
@@ -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"
meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +18 -17
index 8b75a2ada4..8919aa7e8f 100644
@@ -1,19 +1,17 @@
-From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001
+From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001
 From: Koen Kooi <[email protected]>
-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:
-Upstream-Status: Pending
+---
+ configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
-Signed-off-by: Koen Kooi <[email protected]>
-Signed-off-by: Shane Wang <[email protected]>
-
-Index: iproute2-4.14.1/configure
-===================================================================
---- iproute2-4.14.1.orig/configure
-+++ iproute2-4.14.1/configure
-@@ -2,6 +2,7 @@
+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 +19,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
+
meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb renamed from meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb +2 -2
similarity index 72%
rename from meta/recipes-connectivity/iproute2/iproute2_4.19.0.bb
rename to meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb
index 6db4062d68..c5ac987b6f 100644
@@ -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
 #
Signature · 1 line
2.17.1
#1 lore raw

meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch line 10

Quoted 4 lines · Oleksandr Kravchuk
meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +0 -4
-According to Kevin Tian:
-Upstream-Status: Pending
-Signed-off-by: Koen Kooi <[email protected]>
-Signed-off-by: Shane Wang <[email protected]>

These lines were lost from the new patch. Which can happen if the original patch is malformed :( Can you edit them in please (as the commit msg body).

Alex

#2 lore raw
Quoted 11 lines · Alexander Kanavin

meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch line 10

Quoted 4 lines · Oleksandr Kravchuk
meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +0 -4
-According to Kevin Tian:
-Upstream-Status: Pending
-Signed-off-by: Koen Kooi <[email protected]>
-Signed-off-by: Shane Wang <[email protected]>

These lines were lost from the new patch. Which can happen if the original patch is malformed :( Can you edit them in please (as the commit msg body).

By the way, it's now feature freeze so these updates won't make it into 2.7 most likely, but don't be discouraged: the patches can be stashed until the new cycle opens. All effort to keep things current is appreciated.

Alex