summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Little <scott.little@windriver.com>2018-08-01 14:22:39 -0400
committerScott Little <scott.little@windriver.com>2018-08-01 14:22:41 -0400
commite3c55c5feba493a8c46d179e33340eeca2572b77 (patch)
tree40fac2bc72d6efb16ffac546c8af996d673f76a8
parent50808566f9229bec9ed019722d2227e42106c7dd (diff)
Relocate net-tools to stx-integ/networking/net-tools
Move content from stx-gplv2 into stx-integ Packages will be relocated to stx-integ: base/ bash cgcs-users cluster-resource-agents dpkg haproxy libfdt netpbm rpm database/ mariadb filesystem/ iscsi-initiator-utils filesystem/drbd/ drbd-tools kernel/kernel-modules/ drbd integrity intel-e1000e intel-i40e intel-i40evf intel-ixgbe intel-ixgbevf qat17 tpmdd ldap/ ldapscripts networking/ iptables net-tools Change-Id: If1977af7e4cc67ff6251be1cda90f85f77dc7b08 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
Notes
Notes (review): Code-Review+2: Don Penney <don.penney@windriver.com> Code-Review+2: Saul Wold <sgw@linux.intel.com> Workflow+1: Scott Little <scott.little@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 02 Aug 2018 19:16:20 +0000 Reviewed-on: https://review.openstack.org/587966 Project: openstack/stx-gplv2 Branch: refs/heads/master
-rw-r--r--centos_pkg_dirs1
-rw-r--r--net-tools/centos/build_srpm.data2
-rw-r--r--net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch27
-rw-r--r--net-tools/centos/meta_patches/PATCH_ORDER2
-rw-r--r--net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch39
-rw-r--r--net-tools/centos/srpm_path1
-rw-r--r--net-tools/files/net-tools-hostname-ipv6-shortname.patch31
-rw-r--r--net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch29
8 files changed, 0 insertions, 132 deletions
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 9d28c78..0d00428 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,4 +1,3 @@
1iptables 1iptables
2net-tools
3drbd-tools 2drbd-tools
4mariadb 3mariadb
diff --git a/net-tools/centos/build_srpm.data b/net-tools/centos/build_srpm.data
deleted file mode 100644
index 112ca54..0000000
--- a/net-tools/centos/build_srpm.data
+++ /dev/null
@@ -1,2 +0,0 @@
1COPY_LIST="files/*"
2TIS_PATCH_VER=2
diff --git a/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
deleted file mode 100644
index d0f7cf6..0000000
--- a/net-tools/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 27b9c7a5281c84da9f9029deeb31442cf17f5755 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 16:42:22 -0400
4Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch
5
6Conflicts:
7 SPECS/net-tools.spec
8---
9 SPECS/net-tools.spec | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec
13index 2f09372..c8b94cd 100644
14--- a/SPECS/net-tools.spec
15+++ b/SPECS/net-tools.spec
16@@ -3,7 +3,7 @@
17 Summary: Basic networking tools
18 Name: net-tools
19 Version: 2.0
20-Release: 0.22.%{checkout}%{?dist}
21+Release: 0.22.20131004git.el7%{?_tis_dist}.%{tis_patch_ver}
22 License: GPLv2+
23 Group: System Environment/Base
24 URL: http://sourceforge.net/projects/net-tools/
25--
261.9.1
27
diff --git a/net-tools/centos/meta_patches/PATCH_ORDER b/net-tools/centos/meta_patches/PATCH_ORDER
deleted file mode 100644
index 4d63f54..0000000
--- a/net-tools/centos/meta_patches/PATCH_ORDER
+++ /dev/null
@@ -1,2 +0,0 @@
1spec-to-include-TiS-patches.patch
20001-Update-package-versioning-for-TIS-format.patch
diff --git a/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch b/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch
deleted file mode 100644
index eccb7cc..0000000
--- a/net-tools/centos/meta_patches/spec-to-include-TiS-patches.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 24d92c7a7730e71bac4182df53d5fd6f4d7d6957 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 16:42:22 -0400
4Subject: [PATCH 1/2] WRS: spec-to-include-TiS-patches.patch
5
6Conflicts:
7 SPECS/net-tools.spec
8---
9 SPECS/net-tools.spec | 7 +++++++
10 1 file changed, 7 insertions(+)
11
12diff --git a/SPECS/net-tools.spec b/SPECS/net-tools.spec
13index 2ee770e..2f09372 100644
14--- a/SPECS/net-tools.spec
15+++ b/SPECS/net-tools.spec
16@@ -65,6 +65,10 @@ Patch23: net-tools-ifconfig-EiB.patch
17 # sctp was not documented in help and manpage
18 Patch24: net-tools-netstat-sctp-man.patch
19
20+# WindRiver patches
21+Patch100: net-tools-hostname-ipv6-shortname.patch
22+Patch101: net-tools-ifconfig-no-ifstate-on-flush.patch
23+
24 BuildRequires: gettext, libselinux
25 BuildRequires: libselinux-devel
26 BuildRequires: systemd-units
27@@ -103,6 +107,9 @@ cp %SOURCE8 ./man/en_US
28 %patch23 -p1 -b .round-EiB
29 %patch24 -p1 -b .sctp-man
30
31+%patch100 -p1 -b .hostname-ipv6
32+%patch101 -p1 -b .ifconfig-no-ifstate-on-flush
33+
34 touch ./config.h
35
36 %build
37--
381.9.1
39
diff --git a/net-tools/centos/srpm_path b/net-tools/centos/srpm_path
deleted file mode 100644
index cc279a7..0000000
--- a/net-tools/centos/srpm_path
+++ /dev/null
@@ -1 +0,0 @@
1mirror:Source/net-tools-2.0-0.22.20131004git.el7.src.rpm
diff --git a/net-tools/files/net-tools-hostname-ipv6-shortname.patch b/net-tools/files/net-tools-hostname-ipv6-shortname.patch
deleted file mode 100644
index 612e063..0000000
--- a/net-tools/files/net-tools-hostname-ipv6-shortname.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From e1aab6b4103e7d6f625de7b2e4d842826f3a3615 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 16:42:24 -0400
4Subject: [PATCH 1/2] WRS: Patch22: net-tools-hostname-ipv6-shortname.patch
5
6---
7 hostname.c | 7 +-
8 1 file changed, 6 insertions(+), 1 deletion(-)
9
10diff --git a/hostname.c b/hostname.c
11index ae98ca6..56aeb06 100644
12--- a/hostname.c
13+++ b/hostname.c
14@@ -356,8 +356,13 @@ int main(int argc, char **argv)
15 break;
16 case 'a':
17 case 'f':
18- case 'i':
19 case 's':
20+ /*
21+ * These are not supported for IPv6 so just consume the option
22+ * and return the default hostname value
23+ */
24+ break;
25+ case 'i':
26 what = 1;
27 type = c;
28 break;
29--
301.9.1
31
diff --git a/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch b/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch
deleted file mode 100644
index 02a03a1..0000000
--- a/net-tools/files/net-tools-ifconfig-no-ifstate-on-flush.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From c8c0e58c037b4183672666be22782d96d0fc3267 Mon Sep 17 00:00:00 2001
2From: Scott Little <scott.little@windriver.com>
3Date: Mon, 2 Oct 2017 16:42:25 -0400
4Subject: [PATCH 2/2] WRS: Patch23:
5 net-tools-ifconfig-no-ifstate-on-flush.patch
6
7---
8 ifconfig.c | 5 +++++
9 1 file changed, 5 insertions(+)
10
11diff --git a/ifconfig.c b/ifconfig.c
12index df9793a..ebdc1a1 100644
13--- a/ifconfig.c
14+++ b/ifconfig.c
15@@ -982,6 +982,11 @@ int main(int argc, char **argv)
16 exit(1);
17 }
18 r = ioctl(fd, SIOCSIFADDR, &ifr);
19+ if (((struct sockaddr_in*)&sa)->sin_addr.s_addr == INADDR_ANY) {
20+ /* do not continue to change interface state if only flushing addresses */
21+ spp++;
22+ continue;
23+ }
24 break;
25 #endif
26 #if HAVE_AFECONET
27--
281.9.1
29