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/disable-version-check.patch | |
| parent | 527ed0682cdbd10292d82bf67b8820d8a992d105 (diff) | |
| download | meta-openembedded-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/disable-version-check.patch')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 1ca1480c31..9aad894e0c 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -7,11 +7,11 @@ Upstream-status: Inappropriate Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl -index 57a37f7..838b944 100755 ---- a/webmin/webmin-lib.pl -+++ b/webmin/webmin-lib.pl -@@ -1086,28 +1086,28 @@ +Index: webmin-1.850/webmin/webmin-lib.pl +=================================================================== +--- webmin-1.850.orig/webmin/webmin-lib.pl ++++ webmin-1.850/webmin/webmin-lib.pl +@@ -1112,28 +1112,28 @@ my %miniserv; &load_theme_library(); # So that UI functions work # Need OS upgrade @@ -62,4 +62,3 @@ index 57a37f7..838b944 100755 # Password close to expiry my $warn_days = $config{'warn_days'}; - |