helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

openhpi: refresh patches

Browse Source 
WARNING: openhpi-3.6.1-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 openhpi-use-serial-tests-config-needed-by-ptest.patch
patching file configure.ac
Hunk #1 succeeded at 7 with fuzz 2.

Now at patch openhpi-use-serial-tests-config-needed-by-ptest.patch

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster 2018-04-07 23:43:52 -07:00
parent 7579acbbc4
commit 224549c911
5 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch
View File

@ -6,11 +6,11 @@ Upstream-Status: Pending
Signed-of-by: Aws Ismail <aws.ismail@windriver.com>
diff --git a/configure.ac b/configure.ac
index f5a5b74..4a20154 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,11 +605,6 @@ AC_ARG_ENABLE([werror],
Index: openhpi-3.6.1/configure.ac
===================================================================
--- openhpi-3.6.1.orig/configure.ac
+++ openhpi-3.6.1/configure.ac
@@ -656,11 +656,6 @@ AC_ARG_ENABLE([werror],
fi],
[])

18
meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch
View File

@ -4,10 +4,11 @@ Upstream-Status: Pending
Signed-off-by: yanjun.zhu <yanjun.zhu@windriver.com>
diff -urpN a/openhpid/safhpi.c b/openhpid/safhpi.c
--- a/openhpid/safhpi.c
+++ b/openhpid/safhpi.c
@@ -1976,7 +1976,7 @@ SaErrorT SAHPI_API saHpiSensorThresholds
Index: openhpi-3.6.1/openhpid/safhpi.c
===================================================================
--- openhpi-3.6.1.orig/openhpid/safhpi.c
+++ openhpi-3.6.1/openhpid/safhpi.c
@@ -1933,7 +1933,7 @@ SaErrorT SAHPI_API saHpiSensorThresholds
oh_release_domain(d); /* Unlock domain */
OH_CALL_ABI(h, set_sensor_thresholds, SA_ERR_HPI_INVALID_CMD, rv,
@ -16,10 +17,11 @@ diff -urpN a/openhpid/safhpi.c b/openhpid/safhpi.c
oh_release_handler(h);
return rv;
diff -urpN a/utils/sahpi_struct_utils.c b/utils/sahpi_struct_utils.c
--- a/utils/sahpi_struct_utils.c
+++ b/utils/sahpi_struct_utils.c
@@ -3855,6 +3855,9 @@ SaHpiBoolT oh_valid_textbuffer(SaHpiText
Index: openhpi-3.6.1/utils/sahpi_struct_utils.c
===================================================================
--- openhpi-3.6.1.orig/utils/sahpi_struct_utils.c
+++ openhpi-3.6.1/utils/sahpi_struct_utils.c
@@ -3861,6 +3861,9 @@ SaHpiBoolT oh_valid_textbuffer(SaHpiText
/* found a unpaired surrogate */
return SAHPI_FALSE;
}

10
meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch
View File

@ -14,11 +14,11 @@ Date: Mon Dec 17 16:23:45 2012 -0500
Signed-off-by: Aws Ismail <aws.ismail@windriver.com>
diff --git a/hpi_shell/session.c b/hpi_shell/session.c
index 85c31bf..187da4c 100644
--- a/hpi_shell/session.c
+++ b/hpi_shell/session.c
@@ -66,7 +66,7 @@ static void* progress_bar(void *unused)
Index: openhpi-3.6.1/hpi_shell/session.c
===================================================================
--- openhpi-3.6.1.orig/hpi_shell/session.c
+++ openhpi-3.6.1/hpi_shell/session.c
@@ -73,7 +73,7 @@ static void* progress_bar(void *unused)
if (i < (PROGRESS_BUF_SIZE - mes_len - 1)) i++;
t++;
};

10
meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch
View File

@ -6,11 +6,11 @@ Upstream-Status: Pending
Signed-of-by: Aws Ismail <aws.ismail@windriver.com>
diff --git a/configure.ac b/configure.ac
index 30a792c..b5f5aad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/md5.h openssl/bio.h openssl/ssl.h openss
Index: openhpi-3.6.1/configure.ac
===================================================================
--- openhpi-3.6.1.orig/configure.ac
+++ openhpi-3.6.1/configure.ac
@@ -177,7 +177,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/
dnl xml is used for XML-based communication in ilo2_ribcl and oa_soap
AC_CHECK_LIB([xml2],[xmlParseMemory],[XML2_LIB=-lxml2],[XML2_LIB=])

15
meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch
View File

@ -13,19 +13,16 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4b51971..16136b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http://dague.net/sean> 4/23/03
Index: openhpi-3.6.1/configure.ac
===================================================================
--- openhpi-3.6.1.orig/configure.ac
+++ openhpi-3.6.1/configure.ac
@@ -7,7 +7,7 @@ dnl various hacks by Sean Dague <http:
AC_PREREQ(2.57)
AC_INIT(openhpi, 3.5.0)
AC_INIT(openhpi, 3.6.1)
AC_CONFIG_SRCDIR(openhpi.spec.in)
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.8 serial-tests])
AM_CONFIG_HEADER(config.h)
AH_TOP([#ifndef __OPENHPI_CONFIG_H
--
1.7.1