nfs-utils: Remove patches from OpenEmbedded-Core

Test:
1, multi-node deployed with 1 controller and 1 compute enabled
2, duplex deployed wtih 2 controller node enabled

Task: 26447
Story: 2003759

Change-Id: I83ae9a8e2e8a99e6ec5646bb784b85fc58ea33f1
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>

filesystem/nfs-utils/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch

@@ -20,7 +20,7 @@ index d10c87c..b866788 100644
  Epoch: 1
  
  # group all 32bit related archs
-@@ -160,6 +160,7 @@ Provides: rpc.mountd  = %{epoch}:%{version}-%{release}
+@@ -155,6 +155,7 @@ Provides: rpc.mountd  = %{epoch}:%{version}-%{release}
  Provides: rpc.nfsd    = %{epoch}:%{version}-%{release}
  Provides: rpc.statd   = %{epoch}:%{version}-%{release}
  Provides: rpc.gssd    = %{epoch}:%{version}-%{release}

filesystem/nfs-utils/centos/meta_patches/0001-add-rpm-4.14-compatibility.patch

@@ -12,7 +12,7 @@ diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
 index b866788..96fce13 100644
 --- a/SPECS/nfs-utils.spec
 +++ b/SPECS/nfs-utils.spec
-@@ -621,14 +621,7 @@ if [ -h /etc/systemd/system/multi-user.target.wants/nfs.target ]; then
+@@ -610,14 +610,7 @@ if [ -h /etc/systemd/system/multi-user.target.wants/nfs.target ]; then
  	fi
  fi
  

filesystem/nfs-utils/centos/meta_patches/nfs-utils-spec-file-disable-statd-service.patch

@@ -11,7 +11,7 @@ diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
 index 0a5e9fb..d10c87c 100644
 --- a/SPECS/nfs-utils.spec
 +++ b/SPECS/nfs-utils.spec
-@@ -483,6 +483,10 @@ rm $RPM_BUILD_ROOT%{_sbindir}/rpc.svcgssd
+@@ -472,6 +472,10 @@ rm $RPM_BUILD_ROOT%{_sbindir}/rpc.svcgssd
  rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
  rm $RPM_BUILD_ROOT%{_mandir}/man8/svcgssd.8
  
@@ -22,7 +22,7 @@ index 0a5e9fb..d10c87c 100644
  mkdir -p $RPM_BUILD_ROOT/run/sysconfig
  mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/scripts
  mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy
-@@ -499,9 +503,6 @@ ln -s rpc-gssd.service nfs-secure.service
+@@ -488,9 +492,6 @@ ln -s rpc-gssd.service nfs-secure.service
  ln -s rpc-gssd.service rpcgssd.service
  ln -s nfs-idmapd.service  nfs-idmap.service
  ln -s nfs-idmapd.service  rpcidmapd.service
@@ -32,7 +32,7 @@ index 0a5e9fb..d10c87c 100644
  
  mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs
  
-@@ -566,6 +567,12 @@ fi
+@@ -555,6 +556,12 @@ fi
  %post
  if [ $1 -eq 1 ] ; then
  	# Initial installation

filesystem/nfs-utils/centos/meta_patches/spec-include-TiS-changes.patch

@@ -4,39 +4,14 @@ Date: Mon, 15 Oct 2018 22:50:46 +0800
 Subject: [PATCH] WRS: spec-include-TiS-changes.patch
 
 ---
- SPECS/nfs-utils.spec | 14 ++++++++++++++
+ SPECS/nfs-utils.spec | 3 +++
- 1 file changed, 14 insertions(+)
+ 1 file changed, 3 insertions(+)
 
 diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
 index 6dfddc0..0a5e9fb 100644
 --- a/SPECS/nfs-utils.spec
 +++ b/SPECS/nfs-utils.spec
-@@ -145,6 +145,11 @@ Patch1001: nfs-utils-1.2.1-exp-subtree-warn-off.patch
+@@ -569,6 +569,9 @@ if [ $1 -eq 0 ]; then
- Patch1002: nfs-utils-1.2.3-sm-notify-res_init.patch
- Patch1003: nfs-utils-1.2.5-idmap-errmsg.patch
- 
-+# Titanium Cloud Patches
-+Patch2000: nfs-utils-support-mountprog-and-nfsprog-options.patch
-+Patch2001: nfs-utils-do-not-pass-CFLAGS-to-native.patch
-+
-+
- Group: System Environment/Daemons
- Provides: exportfs    = %{epoch}:%{version}-%{release}
- Provides: nfsstat     = %{epoch}:%{version}-%{release}
-@@ -418,6 +423,12 @@ This package also contains the mount.nfs and umount.nfs program.
- %patch1002 -p1
- %patch1003 -p1
- 
-+%patch2000 -p1
-+# Titanium Cloud support mountprog and nfsprog options
-+%patch2001 -p1
-+# Titanium Cloud do not pass CFLAGS to native
-+
-+
- # Remove .orig files
- find . -name "*.orig" | xargs rm -f
- 
-@@ -569,6 +580,9 @@ if [ $1 -eq 0 ]; then
  	%systemd_preun nfs-client.target
  	%systemd_preun nfs-server.server
  

filesystem/nfs-utils/centos/patches/nfs-utils-do-not-pass-CFLAGS-to-native.patch

@@ -1,38 +0,0 @@
-Do not pass CFLAGS to gcc while building native tool
-
-Do not pass CFLAGS/LDFLAGS to gcc while building native tool, The 
-needed flags has been passed by xxx_CFLAGS=$(CFLAGS_FOR_BUILD).
----
- tools/locktest/Makefile.am | 2 ++
- tools/rpcgen/Makefile.am   | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am
-index 3156815..1729fd1 100644
---- a/tools/locktest/Makefile.am
-+++ b/tools/locktest/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
-+CFLAGS=
-+LDFLAGS=
- LIBTOOL = @LIBTOOL@ --tag=CC
- 
- noinst_PROGRAMS = testlk
-diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am
-index 8a9ec89..8bacdaa 100644
---- a/tools/rpcgen/Makefile.am
-+++ b/tools/rpcgen/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
-+CFLAGS=
-+LDFLAGS=
- LIBTOOL = @LIBTOOL@ --tag=CC
- 
- noinst_PROGRAMS = rpcgen
--- 
-1.9.1
-

filesystem/nfs-utils/centos/patches/nfs-utils-support-mountprog-and-nfsprog-options.patch

@@ -1,46 +0,0 @@
-From 63619d0ee991bd7bcf3e09c7f0dbff283b57be06 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 15 Apr 2013 17:12:26 +0800
-Subject: nfs-utils: support mountprog and nfsprog options
-
-Add back the support for mountprog and nfsprog options since they
-are supported by our kernel NFS client.
-
-Upstream-status: Inappropriate
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- utils/mount/stropts.c | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
-index 4b59974..ca082b6 100644
---- a/utils/mount/stropts.c
-+++ b/utils/mount/stropts.c
-@@ -445,9 +445,6 @@ static int nfs_construct_new_options(struct mount_options *options,
- 	char new_option[64];
- 	char *netid;
- 
--	po_remove_all(options, "nfsprog");
--	po_remove_all(options, "mountprog");
--
- 	po_remove_all(options, "v2");
- 	po_remove_all(options, "v3");
- 	po_remove_all(options, "vers");
-@@ -557,13 +554,6 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options, int checkv4)
- 		return 0;
- 	}
- 
--	/*
--	 * The kernel NFS client doesn't support changing the RPC
--	 * program number for these services, so force the value of
--	 * these fields before probing the server's ports.
--	 */
--	nfs_pmap.pm_prog = NFS_PROGRAM;
--	mnt_pmap.pm_prog = MOUNTPROG;
- 
- 	/*
- 	 * If the server's rpcbind service isn't available, we can't
--- 
-2.7.4
-

filesystem/nfs-utils/files/nfs-utils-do-not-pass-CFLAGS-to-native.patch

@@ -1,36 +0,0 @@
-Do not pass CFLAGS to gcc while building native tool
-
-Do not pass CFLAGS/LDFLAGS to gcc while building native tool, The 
-needed flags has been passed by xxx_CFLAGS=$(CFLAGS_FOR_BUILD).
----
- tools/locktest/Makefile.am |    2 ++
- tools/rpcdebug/Makefile.am |    2 ++
- tools/rpcgen/Makefile.am   |    2 ++
- 3 files changed, 6 insertions(+), 0 deletions(-)
-
-Index: nfs-utils-1.2.8/tools/locktest/Makefile.am
-===================================================================
---- nfs-utils-1.2.8.orig/tools/locktest/Makefile.am
-+++ nfs-utils-1.2.8/tools/locktest/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
-+CFLAGS=
-+LDFLAGS=
- LIBTOOL = @LIBTOOL@ --tag=CC
- 
- noinst_PROGRAMS = testlk
-Index: nfs-utils-1.2.8/tools/rpcgen/Makefile.am
-===================================================================
---- nfs-utils-1.2.8.orig/tools/rpcgen/Makefile.am
-+++ nfs-utils-1.2.8/tools/rpcgen/Makefile.am
-@@ -1,6 +1,8 @@
- ## Process this file with automake to produce Makefile.in
- 
- CC=$(CC_FOR_BUILD)
-+CFLAGS=
-+LDFLAGS=
- LIBTOOL = @LIBTOOL@ --tag=CC
- 
- noinst_PROGRAMS = rpcgen

filesystem/nfs-utils/files/nfs-utils-support-mountprog-and-nfsprog-options.patch

@@ -1,46 +0,0 @@
-From 10ecc386dc9e8aec697f782473b71fd6702e849c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Mon, 15 Apr 2013 17:12:26 +0800
-Subject: [PATCH] nfs-utils: support mountprog and nfsprog options
-
-Add back the support for mountprog and nfsprog options since they
-are supported by our kernel NFS client.
-
-Upstream-status: Inappropriate
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- utils/mount/stropts.c |   10 ----------
- 1 files changed, 0 insertions(+), 10 deletions(-)
-
-diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
-index 50a1a2a..e14a68a 100644
---- a/utils/mount/stropts.c
-+++ b/utils/mount/stropts.c
-@@ -444,9 +444,6 @@ static int nfs_construct_new_options(struct mount_options *options,
- 	char new_option[64];
- 	char *netid;
- 
--	po_remove_all(options, "nfsprog");
--	po_remove_all(options, "mountprog");
--
- 	po_remove_all(options, "v2");
- 	po_remove_all(options, "v3");
- 	po_remove_all(options, "vers");
-@@ -552,13 +549,6 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options)
- 		return 0;
- 	}
- 
--	/*
--	 * The kernel NFS client doesn't support changing the RPC
--	 * program number for these services, so force the value of
--	 * these fields before probing the server's ports.
--	 */
--	nfs_pmap.pm_prog = NFS_PROGRAM;
--	mnt_pmap.pm_prog = MOUNTPROG;
- 
- 	/*
- 	 * If the server's rpcbind service isn't available, we can't
--- 
-1.7.4.1
-