mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

openipmi: refresh patches

Browse Source 
WARNING: openipmi-2.0.24-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 include_sys_types.patch
patching file ui/ui.c
Hunk #1 succeeded at 42 with fuzz 1.

Now at patch include_sys_types.patch

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2018-04-07 23:39:29 -07:00
parent 99412515cd
commit 807b102f9f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-support/openipmi/files/fix-symlink-install-error-in-cmdlang.patch
+5 -5
View File
@@ -8,11 +8,11 @@ Date: Thu Jun 7 16:00:13 2012 -0400
Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
index 92d6e83..f6039f9 100644
--- a/cmdlang/Makefile.am
+++ b/cmdlang/Makefile.am
@@ -36,6 +36,7 @@ CLEANFILES = libOpenIPMIcmdlang.map
Index: OpenIPMI-2.0.24/cmdlang/Makefile.am
===================================================================
--- OpenIPMI-2.0.24.orig/cmdlang/Makefile.am
+++ OpenIPMI-2.0.24/cmdlang/Makefile.am
@@ -35,6 +35,7 @@ openipmish_LDADD = libOpenIPMIcmdlang.l
# compatability.
install-data-local:
rm -f $(DESTDIR)$(bindir)/ipmish
meta-networking/recipes-support/openipmi/files/include_sys_types.patch
+4 -4
View File
@@ -3,10 +3,10 @@ include sys/types.h for u_int32_t
ui.c:340:5: error: unknown type name 'u_int32_t'; did you mean 'uint32_t'?
u_int32_t addr;
^~~~~~~~~
Index: OpenIPMI-2.0.22/ui/ui.c
Index: OpenIPMI-2.0.24/ui/ui.c
===================================================================
--- OpenIPMI-2.0.22.orig/ui/ui.c
+++ OpenIPMI-2.0.22/ui/ui.c
--- OpenIPMI-2.0.24.orig/ui/ui.c
+++ OpenIPMI-2.0.24/ui/ui.c
@@ -42,6 +42,7 @@
#include <fcntl.h>
#include <time.h>
@@ -14,4 +14,4 @@ Index: OpenIPMI-2.0.22/ui/ui.c
+#include <sys/types.h>
#include <ctype.h>
#include <OpenIPMI/selector.h>
#include <OpenIPMI/ipmi_err.h>