diff options
5 files changed, 31 insertions, 32 deletions
diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch index 029b857bc1..97c515e00b 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-host-gcc.patch @@ -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], []) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch index 205696e651..60e2e79191 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-fix-testfail-errors.patch @@ -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; } diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch index 7dac453189..cc21ff8c79 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch @@ -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++; }; diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch index 6d3b6648a8..c848b35027 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch @@ -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=]) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch index 51537ef128..3e09180d4d 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch @@ -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 - |