From 2fec58fae4556c0b07eb723a7fcdd87465fb3436 Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 14 Aug 2018 01:23:02 +0800 Subject: [PATCH] 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 --- centos_pkg_dirs | 1 - networking/iproute/centos/build_srpm.data | 1 - ...te-package-versioning-for-TIS-format.patch | 27 ------------- .../Add-WRS-ip-maddr-fix-ifname.patch | 40 ------------------- .../iproute/centos/meta_patches/PATCH_ORDER | 2 - .../centos/patches/ip-maddr-fix-ifname.patch | 27 ------------- networking/iproute/centos/srpm_path | 1 - 7 files changed, 99 deletions(-) delete mode 100644 networking/iproute/centos/build_srpm.data delete mode 100644 networking/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch delete mode 100644 networking/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch delete mode 100644 networking/iproute/centos/meta_patches/PATCH_ORDER delete mode 100644 networking/iproute/centos/patches/ip-maddr-fix-ifname.patch delete mode 100644 networking/iproute/centos/srpm_path diff --git a/centos_pkg_dirs b/centos_pkg_dirs index a73170e16..44faedf58 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -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 diff --git a/networking/iproute/centos/build_srpm.data b/networking/iproute/centos/build_srpm.data deleted file mode 100644 index 70b4b5dcb..000000000 --- a/networking/iproute/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=2 diff --git a/networking/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 9593cd073..000000000 --- a/networking/iproute/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fdb3dda504c044aeb0b572c2ac4661b345aed15e Mon Sep 17 00:00:00 2001 -From: Scott Little -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 - diff --git a/networking/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch b/networking/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch deleted file mode 100644 index af2e4cd89..000000000 --- a/networking/iproute/centos/meta_patches/Add-WRS-ip-maddr-fix-ifname.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8ef373e01a4175e5a170dd7767533e8a6dc9c407 Mon Sep 17 00:00:00 2001 -From: Scott Little -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 - diff --git a/networking/iproute/centos/meta_patches/PATCH_ORDER b/networking/iproute/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 2540f1ff3..000000000 --- a/networking/iproute/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,2 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch -Add-WRS-ip-maddr-fix-ifname.patch diff --git a/networking/iproute/centos/patches/ip-maddr-fix-ifname.patch b/networking/iproute/centos/patches/ip-maddr-fix-ifname.patch deleted file mode 100644 index b75cdcba9..000000000 --- a/networking/iproute/centos/patches/ip-maddr-fix-ifname.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9a98e4f90d0f8990674ab00e292fe8ad70af1afe Mon Sep 17 00:00:00 2001 -From: Tao Liu -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 - diff --git a/networking/iproute/centos/srpm_path b/networking/iproute/centos/srpm_path deleted file mode 100644 index 08151ce82..000000000 --- a/networking/iproute/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/iproute-3.10.0-87.el7.src.rpm