diff options
author | Ross Burton <ross.burton@intel.com> | 2017-11-15 16:47:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-07 06:34:50 -0800 |
commit | 9e6be8b149516d406d9b3d1d870cb2b8f5ddb4b4 (patch) | |
tree | 27fc811dec1303b05c1d0332cb7d763aeb926b17 /meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch | |
parent | 5b63a64f7f47f76667bd1933d9a716e320b9bbb5 (diff) | |
download | poky-9e6be8b149516d406d9b3d1d870cb2b8f5ddb4b4.tar.gz |
nfs-utils: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.
Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450). This is obviously bad.
We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.
(From OE-Core rev: 0902bef12c815f302f04fa28606ece4b014260d6)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch')
-rw-r--r-- | meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch index 14bd4036af..822939f0d2 100644 --- a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch +++ b/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch | |||
@@ -16,11 +16,11 @@ Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> | |||
16 | utils/statd/start-statd | 2 +- | 16 | utils/statd/start-statd | 2 +- |
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/utils/statd/start-statd b/utils/statd/start-statd | 19 | Index: nfs-utils-2.1.1/utils/statd/start-statd |
20 | index 8211a90..3c2aa6f 100755 | 20 | =================================================================== |
21 | --- a/utils/statd/start-statd | 21 | --- nfs-utils-2.1.1.orig/utils/statd/start-statd |
22 | +++ b/utils/statd/start-statd | 22 | +++ nfs-utils-2.1.1/utils/statd/start-statd |
23 | @@ -16,7 +16,7 @@ fi | 23 | @@ -28,7 +28,7 @@ fi |
24 | # First try systemd if it's installed. | 24 | # First try systemd if it's installed. |
25 | if [ -d /run/systemd/system ]; then | 25 | if [ -d /run/systemd/system ]; then |
26 | # Quit only if the call worked. | 26 | # Quit only if the call worked. |
@@ -28,7 +28,4 @@ index 8211a90..3c2aa6f 100755 | |||
28 | + systemctl start nfs-statd.service && exit | 28 | + systemctl start nfs-statd.service && exit |
29 | fi | 29 | fi |
30 | 30 | ||
31 | # Fall back to launching it ourselves. | 31 | cd / |
32 | -- | ||
33 | 2.1.4 | ||
34 | |||