mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-02-19 03:50:38 +00:00
3ab88a7f43
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>
26 lines
1.4 KiB
Diff
26 lines
1.4 KiB
Diff
# Add support for configuring network interfaces on a generic linux system
|
||
#
|
||
# Upstream-status: Not appropriate [config]
|
||
#
|
||
# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||
Index: webmin-1.850/net/module.info
|
||
===================================================================
|
||
--- webmin-1.850.orig/net/module.info
|
||
+++ webmin-1.850/net/module.info
|
||
@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워í<C592>¬ 구성
|
||
name=Networking
|
||
desc_tr=Að Yapýlandýrmasý
|
||
desc_de=Netzwerkkonfiguration
|
||
-os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
|
||
+os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
|
||
desc_sk=Konfigurácia siete
|
||
desc_zh_CN=ÍøÂçÅäÖÃ
|
||
risk=low medium high
|
||
Index: webmin-1.850/net/generic-linux-lib.pl
|
||
===================================================================
|
||
--- /dev/null
|
||
+++ webmin-1.850/net/generic-linux-lib.pl
|
||
@@ -0,0 +1,2 @@
|
||
+do 'linux-lib.pl';
|
||
+
|