starlingx
/
integ
Code Issues Proposed changes

de-fuzz nfs-utils patches 

When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: I485e28dd3251c908ae1e918a15d3ea33e1ee8475
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 08:06:37 +08:00
parent 996f18d0e8
commit 0fc7a655c9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From 15f61f1842d76dcf15e506b2b4f755cace7d4b29 Mon Sep 17 00:00:00 2001 From e4e3c372324522e93de793ee62e9509123a144a8 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 15:19:43 -0400 Date: Mon, 2 Oct 2017 15:19:43 -0400
Subject: [PATCH 3/4] WRS: nfs-utils-spec-file-disable-statd-service.patch Subject: WRS: nfs-utils-spec-file-disable-statd-service.patch
Conflicts: Conflicts:
SPECS/nfs-utils.spec SPECS/nfs-utils.spec
@ -10,10 +10,10 @@ Conflicts:
1 file changed, 10 insertions(+), 3 deletions(-) 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec
index 1fecdba..8585c5d 100644 index 7793ee1..a947119 100644
--- a/SPECS/nfs-utils.spec --- a/SPECS/nfs-utils.spec
+++ b/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec
@@ -451,6 +451,10 @@ rm $RPM_BUILD_ROOT%{_sbindir}/rpc.svcgssd @@ -487,6 +487,10 @@ rm $RPM_BUILD_ROOT%{_sbindir}/rpc.svcgssd
rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8 rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8
rm $RPM_BUILD_ROOT%{_mandir}/man8/svcgssd.8 rm $RPM_BUILD_ROOT%{_mandir}/man8/svcgssd.8
@ -24,7 +24,7 @@ index 1fecdba..8585c5d 100644
mkdir -p $RPM_BUILD_ROOT/run/sysconfig mkdir -p $RPM_BUILD_ROOT/run/sysconfig
mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/scripts mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/scripts
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gssproxy
@@ -474,9 +478,6 @@ ln -s rpc-gssd.service nfs-secure.service @@ -510,9 +514,6 @@ ln -s rpc-gssd.service nfs-secure.service
ln -s rpc-gssd.service rpcgssd.service ln -s rpc-gssd.service rpcgssd.service
ln -s nfs-idmapd.service nfs-idmap.service ln -s nfs-idmapd.service nfs-idmap.service
ln -s nfs-idmapd.service rpcidmapd.service ln -s nfs-idmapd.service rpcidmapd.service
@ -34,7 +34,7 @@ index 1fecdba..8585c5d 100644
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/rpc_pipefs
@@ -541,6 +542,12 @@ fi @@ -577,6 +578,12 @@ fi
%post %post
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
# Initial installation # Initial installation
@ -48,5 +48,5 @@ index 1fecdba..8585c5d 100644
/bin/systemctl restart nfs-config >/dev/null 2>&1 || : /bin/systemctl restart nfs-config >/dev/null 2>&1 || :
-- --
1.9.1 2.7.4

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

@ -1,7 +1,7 @@
From 10ecc386dc9e8aec697f782473b71fd6702e849c Mon Sep 17 00:00:00 2001 From 63619d0ee991bd7bcf3e09c7f0dbff283b57be06 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com> From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 15 Apr 2013 17:12:26 +0800 Date: Mon, 15 Apr 2013 17:12:26 +0800
Subject: [PATCH] nfs-utils: support mountprog and nfsprog options Subject: nfs-utils: support mountprog and nfsprog options
Add back the support for mountprog and nfsprog options since they Add back the support for mountprog and nfsprog options since they
are supported by our kernel NFS client. are supported by our kernel NFS client.
@ -10,14 +10,14 @@ Upstream-status: Inappropriate
Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
--- ---
utils/mount/stropts.c | 10 - utils/mount/stropts.c | 10 ----------
1 file changed, 10 deletions(-) 1 file changed, 10 deletions(-)
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 44a941f..e686577 100644 index 4b59974..ca082b6 100644
--- a/utils/mount/stropts.c --- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c +++ b/utils/mount/stropts.c
@@ -451,9 +451,6 @@ static int nfs_construct_new_options(struct mount_options *options, @@ -445,9 +445,6 @@ static int nfs_construct_new_options(struct mount_options *options,
char new_option[64]; char new_option[64];
char *netid; char *netid;
@ -27,7 +27,7 @@ index 44a941f..e686577 100644
po_remove_all(options, "v2"); po_remove_all(options, "v2");
po_remove_all(options, "v3"); po_remove_all(options, "v3");
po_remove_all(options, "vers"); po_remove_all(options, "vers");
@@ -563,13 +560,6 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options, int checkv4) @@ -557,13 +554,6 @@ nfs_rewrite_pmap_mount_options(struct mount_options *options, int checkv4)
return 0; return 0;
} }
@ -42,5 +42,5 @@ index 44a941f..e686577 100644
/* /*
* If the server's rpcbind service isn't available, we can't * If the server's rpcbind service isn't available, we can't
-- --
1.9.1 2.7.4