starlingx/integ
Code Issues Proposed changes

Merge "Fix net-tools build issue with 4.18 kernel from CentOS 8"

Browse Source
This commit is contained in:
Zuul 2020-05-01 14:03:48 +00:00 committed by Gerrit Code Review
commit da4c5afa5a
5 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
networking/net-tools/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
COPY_LIST="files/*"
TIS_PATCH_VER=2
TIS_PATCH_VER=3

25
networking/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,25 +0,0 @@
From 27b9c7a5281c84da9f9029deeb31442cf17f5755 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:42:22 -0400
Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
---
SPECS/net-tools.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec
index 2f09372..c8b94cd 100644
--- a/SPECS/net-tools.spec
+++ b/SPECS/net-tools.spec
@@ -3,7 +3,7 @@
Summary: Basic networking tools
Name: net-tools
Version: 2.0
-Release: 0.24.%{checkout}%{?dist}
+Release: 0.24.20131004git.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+
Group: System Environment/Base
URL: http://sourceforge.net/projects/net-tools/
--
1.9.1

1
networking/net-tools/centos/meta_patches/PATCH_ORDER
View File

@ -1,2 +1 @@
spec-to-include-TiS-patches.patch
0001-Update-package-versioning-for-TIS-format.patch

32
networking/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch
View File

@ -1,37 +1,49 @@
From 24d92c7a7730e71bac4182df53d5fd6f4d7d6957 Mon Sep 17 00:00:00 2001
From 98d37e1ee488883576260d9098d233902ef26ffb Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:42:22 -0400
Subject: [PATCH 1/2] WRS: spec-to-include-TiS-patches.patch
Date: Sun, 16 Feb 2020 04:59:41 +0000
Subject: [PATCH] WRS: spec-to-include-TiS-patches.patch
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
SPECS/net-tools.spec | 7 +++++++
1 file changed, 7 insertions(+)
SPECS/net-tools.spec | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec
index 2ee770e..2f09372 100644
index d8497ee..25285cc 100644
--- a/SPECS/net-tools.spec
+++ b/SPECS/net-tools.spec
@@ -68,6 +68,10 @@ Patch24: net-tools-netstat-sctp-man.patch
@@ -3,7 +3,7 @@
Summary: Basic networking tools
Name: net-tools
Version: 2.0
-Release: 0.24.%{checkout}%{?dist}
+Release: 0.24.20131004git.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+
Group: System Environment/Base
URL: http://sourceforge.net/projects/net-tools/
@@ -68,6 +68,11 @@ Patch24: net-tools-netstat-sctp-man.patch
# output of interface names was restricted to 8-10 characters max
Patch25: net-tools-interface-name-len.patch
+# WindRiver patches
+# STX patches
+Patch100: net-tools-hostname-ipv6-shortname.patch
+Patch101: net-tools-ifconfig-no-ifstate-on-flush.patch
+Patch102: fix-compile-error-with-4.18-kernel.patch
+
BuildRequires: gettext, libselinux
BuildRequires: libselinux-devel
BuildRequires: systemd-units
@@ -107,6 +111,9 @@ cp %SOURCE8 ./man/en_US
@@ -107,6 +112,10 @@ cp %SOURCE8 ./man/en_US
%patch24 -p1 -b .sctp-man
%patch25 -p1 -b .interface-name-len
+%patch100 -p1 -b .hostname-ipv6
+%patch101 -p1 -b .ifconfig-no-ifstate-on-flush
+%patch102 -p1 -b .fix-compile-error
+
touch ./config.h
%build
--
1.9.1
2.7.4

29
networking/net-tools/files/fix-compile-error-with-4.18-kernel.patch Normal file
View File

@ -0,0 +1,29 @@
From 54dbb5d37a5e370b7ce1c49b5ae79571713ba053 Mon Sep 17 00:00:00 2001
From: Sun Austin <austin.sun@intel.com>
Date: Fri, 14 Feb 2020 13:49:01 +0000
Subject: [PATCH] fix compile error with 4.18 kernel
remove "netinet/ip.h" to avoid redefinition of 'struct iphdr'.
It is defined in 4.18 kernel header file "linux/ip.h" already.
Signed-off-by: Sun Austin <austin.sun@intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
iptunnel.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/iptunnel.c b/iptunnel.c
index 5ed587c..901e557 100644
--- a/iptunnel.c
+++ b/iptunnel.c
@@ -26,7 +26,6 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
-#include <netinet/ip.h>
#include <arpa/inet.h>
#if defined(__GLIBC__) && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1))
#include <net/if.h>
--
2.7.4