diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 23:12:58 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:42 -0700 |
| commit | 3ab88a7f4374e1cac2020d63e10c3a8d31a81092 (patch) | |
| tree | c4330e8a05e947e23bc120a31fd7f3ae6359672b /meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch | |
| parent | 527ed0682cdbd10292d82bf67b8820d8a992d105 (diff) | |
| download | meta-openembedded-contrib-3ab88a7f4374e1cac2020d63e10c3a8d31a81092.tar.gz | |
webmin: refresh patches
WARNING: webmin-1.850-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch nfs-export.patch
patching file exports/save_export.cgi
Hunk #1 succeeded at 50 (offset 10 lines).
Hunk #2 succeeded at 87 with fuzz 2 (offset 17 lines).
Now at patch nfs-export.patch
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch b/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch index 177d8a372e..d5dfed5ad4 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch @@ -14,11 +14,11 @@ Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> exports/exports-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/exports/exports-lib.pl b/exports/exports-lib.pl -index 22891c0..1c67494 100755 ---- a/exports/exports-lib.pl -+++ b/exports/exports-lib.pl -@@ -273,7 +273,7 @@ return !&has_command("rpc.nfsd") && !&has_command("nfsd") && +Index: webmin-1.850/exports/exports-lib.pl +=================================================================== +--- webmin-1.850.orig/exports/exports-lib.pl ++++ webmin-1.850/exports/exports-lib.pl +@@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha sub restart_mountd { # Try exportfs -r first @@ -27,6 +27,3 @@ index 22891c0..1c67494 100755 my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); if (!$? && $out !~ /invalid|error|failed/i) { # Looks like it worked! --- -1.7.9.5 - |