rebase iproute patch to CentOS7.5

The patch already merged in the package, so switch to use rpm

Story: 2003389
Task: 24477

Change-Id: I96760959aebbaf0fcf923d8aef5ec4ff4a163864
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-14 01:23:02 +08:00 committed by chenyan
parent 3a91f4cfb4
commit 2fec58fae4
7 changed files with 0 additions and 99 deletions

View File

@ -92,7 +92,6 @@ python/python-gunicorn
config/puppet-modules/openstack/puppet-oslo-11.3.0
strorage-drivers/python-3parclient
strorage-drivers/python-lefthandclient
networking/iproute
security/tboot
networking/mellanox/libibverbs
kernel/kernel-modules/mlnx-ofa_kernel

View File

@ -1 +0,0 @@
TIS_PATCH_VER=2

View File

@ -1,27 +0,0 @@
From fdb3dda504c044aeb0b572c2ac4661b345aed15e Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 18:28:51 -0400
Subject: [PATCH 1/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/iproute.spec
---
SPECS/iproute.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec
index 83991ef..ee7bc77 100644
--- a/SPECS/iproute.spec
+++ b/SPECS/iproute.spec
@@ -2,7 +2,7 @@
%define rpmversion 3.10.0
%define baserelease 74.el7
-%define specrelease 87%{?dist}
+%define specrelease 87.el7%{?_tis_dist}.%{tis_patch_ver}
%define pkg_release %{specrelease}%{?buildid}
Summary: Advanced IP routing and network device configuration tools
--
1.9.1

View File

@ -1,40 +0,0 @@
From 8ef373e01a4175e5a170dd7767533e8a6dc9c407 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 18:28:51 -0400
Subject: [PATCH 2/2] WRS: Add-WRS-ip-maddr-fix-ifname.patch
Conflicts:
SPECS/iproute.spec
---
SPECS/iproute.spec | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/SPECS/iproute.spec b/SPECS/iproute.spec
index ee7bc77..57ce332 100644
--- a/SPECS/iproute.spec
+++ b/SPECS/iproute.spec
@@ -183,6 +183,10 @@ Patch171: 0172-devlink-Convert-conditional-in-dl_argv_handle_port-t.pa
Patch172: 0173-devlink-write-usage-help-messages-to-stderr.patch
Patch173: 0174-devlink-Add-usage-help-for-eswitch-subcommand.patch
Patch174: 0175-devlink-Call-dl_free-in-early-exit-case.patch
+
+# WRS
+Patch500: ip-maddr-fix-ifname.patch
+
License: GPLv2+ and Public Domain
BuildRequires: bison
BuildRequires: flex
@@ -398,6 +402,10 @@ The libnetlink static library.
%patch172 -p1
%patch173 -p1
%patch174 -p1
+
+# WRS
+%patch500 -p1
+
sed -i 's/iproute-doc/%{name}-%{version}/' man/man8/lnstat.8
%build
--
1.9.1

View File

@ -1,2 +0,0 @@
0001-Update-package-versioning-for-TIS-format.patch
Add-WRS-ip-maddr-fix-ifname.patch

View File

@ -1,27 +0,0 @@
From 9a98e4f90d0f8990674ab00e292fe8ad70af1afe Mon Sep 17 00:00:00 2001
From: Tao Liu <tao.liu@windriver.com>
Date: Tue, 30 May 2017 18:06:10 -0400
Subject: [PATCH 1/1] ip maddr remove trailing colon from the interface name
---
ip/ipmaddr.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ip/ipmaddr.c b/ip/ipmaddr.c
index a77a18f..975bd57 100644
--- a/ip/ipmaddr.c
+++ b/ip/ipmaddr.c
@@ -143,6 +143,10 @@ static void read_igmp(struct ma_info **result_p)
if (buf[0] != '\t') {
sscanf(buf, "%d%s", &m.index, m.name);
+ /* remove last character if it is a colon */
+ if (strlen(m.name) > 0 && (m.name[strlen(m.name)-1] == ':')) {
+ m.name[strlen(m.name)-1] = 0;
+ }
continue;
}
--
1.8.3.1

View File

@ -1 +0,0 @@
mirror:Source/iproute-3.10.0-87.el7.src.rpm