From a4c3b42a446d2b28ee45f1c532da8af9a2a743573438e7ae83f5620c556c72d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Thu, 28 Feb 2013 13:24:25 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=12 --- fwum_enhance_output.patch | 69 ++++---- several_more_compile_fixes.patch | 273 ++++++++----------------------- 2 files changed, 94 insertions(+), 248 deletions(-) diff --git a/fwum_enhance_output.patch b/fwum_enhance_output.patch index 4bbc907..d3d1438 100644 --- a/fwum_enhance_output.patch +++ b/fwum_enhance_output.patch @@ -1,39 +1,30 @@ -Be more verbose when detecting a board mismatch when trying to flash the firmware - -Signed-off-by: Thomas Renninger - ---- - lib/ipmi_fwum.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -Index: ipmitool-1.8.11/lib/ipmi_fwum.c -=================================================================== ---- ipmitool-1.8.11.orig/lib/ipmi_fwum.c -+++ ipmitool-1.8.11/lib/ipmi_fwum.c -@@ -1656,13 +1656,15 @@ tKFWUM_Status KfwumValidFirmwareForBoard - - if(boardInfo.iana != firmInfo.iana) - { -- printf("Board IANA does not match firmware IANA\n"); -+ printf("Board IANA [%u] does not match firmware IANA [%u]\n", -+ boardInfo.iana, firmInfo.iana); - status = KFWUM_STATUS_ERROR; - } - - if(boardInfo.boardId != firmInfo.boardId) - { -- printf("Board IANA does not match firmware IANA\n"); -+ printf("Error: Board ID [%u] does not match firmware board ID [%u]\n", -+ boardInfo.boardId, firmInfo.boardId); - status = KFWUM_STATUS_ERROR; - } - -@@ -1680,6 +1682,8 @@ static void KfwumOutputInfo(tKFWUM_Board - { - printf("Target Board Id : %u\n",boardInfo.boardId); - printf("Target IANA number : %u\n",boardInfo.iana); -+ printf("FW File Board Id : %u\n",firmInfo.boardId); -+ printf("FW File IANA number : %u\n",firmInfo.iana); - printf("File Size : %lu bytes\n",firmInfo.fileSize); - printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor, - firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev); +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c ./lib/ipmi_fwum.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c 2012-01-21 06:35:49.000000000 +0100 ++++ ./lib/ipmi_fwum.c 2013-02-28 13:53:34.644417793 +0100 +@@ -1648,13 +1656,15 @@ + + if(boardInfo.iana != firmInfo.iana) + { +- printf("Board IANA does not match firmware IANA\n"); ++ printf("Board IANA [%u] does not match firmware IANA [%u]\n", ++ boardInfo.iana, firmInfo.iana); + status = KFWUM_STATUS_ERROR; + } + + if(boardInfo.boardId != firmInfo.boardId) + { +- printf("Board IANA does not match firmware IANA\n"); ++ printf("Error: Board ID [%u] does not match firmware board ID [%u]\n", ++ boardInfo.boardId, firmInfo.boardId); + status = KFWUM_STATUS_ERROR; + } + +@@ -1672,6 +1682,8 @@ + { + printf("Target Board Id : %u\n",boardInfo.boardId); + printf("Target IANA number : %u\n",boardInfo.iana); ++ printf("FW File Board Id : %u\n",firmInfo.boardId); ++ printf("FW File IANA number : %u\n",firmInfo.iana); + printf("File Size : %lu bytes\n",firmInfo.fileSize); + printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor, + firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev); diff --git a/several_more_compile_fixes.patch b/several_more_compile_fixes.patch index 044e64a..0e3fd0c 100644 --- a/several_more_compile_fixes.patch +++ b/several_more_compile_fixes.patch @@ -1,45 +1,6 @@ -Fixes several compile warnings listed below - -ipmi_sdr.c: In function 'ipmi_sdr_print_sensor_full': -ipmi_sdr.c:1177: warning: implicit declaration of function 'ipmi_sensor_get_sensor_reading_factors' - -ipmi_chassis.c:1143: warning: unused variable 'i' -ipmi_chassis.c:717: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long unsigned int' -ipmi_chassis.c:720: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long unsigned int' -ipmi_chassis.c:724: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long unsigned int' - -================================================================================ ---- ipmitool-1.8.11/lib/ipmi_chassis.c -+++ ipmitool-1.8.11/lib/ipmi_chassis.c -@@ -714,14 +714,14 @@ - - printf(" Boot Initiator Info :\n"); - printf(" Channel Number : %d\n", (rsp->data[2] & 0x0f)); -- printf(" Session Id : %08Xh\n",session_id); -+ printf(" Session Id : %08lXh\n",session_id); - if(timestamp != 0) - { -- printf(" Timestamp : %08Xh, %s\n",timestamp,time_buf); -+ printf(" Timestamp : %08lXh, %s\n",timestamp,time_buf); - } - else - { -- printf(" Timestamp : %08Xh, undefined\n",timestamp); -+ printf(" Timestamp : %08lXh, undefined\n",timestamp); - } - - } -@@ -1140,8 +1140,6 @@ - memset(&flags[0], 0, sizeof(flags)); - token = strtok_r(argv[2] + 8, ",", &saveptr); - while (token != NULL) { -- int i; -- - if (strcmp(token, "help") == 0) { - optionError = 1; - break; ---- ipmitool-1.8.11/lib/ipmi_ekanalyzer.c -+++ ipmitool-1.8.11/lib/ipmi_ekanalyzer.c +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_ekanalyzer.c ./lib/ipmi_ekanalyzer.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_ekanalyzer.c 2013-02-28 13:59:10.489669393 +0100 ++++ ./lib/ipmi_ekanalyzer.c 2013-02-28 14:03:01.722792252 +0100 @@ -395,7 +395,6 @@ static int ipmi_ek_get_file_type( char * argument ) @@ -65,7 +26,7 @@ ipmi_chassis.c:724: warning: format '%08X' expects type 'unsigned int', but argu /*Create an empty list*/ for ( list=0; listheader.len; offset += sizeof(struct fru_picmgext_link_desc) ) { -- /* to solve little endian /big endian problem */ -+ /* to solve little endian /big endian problem */ - unsigned long data; - struct fru_picmgext_link_desc * d; - @@ -3419,7 +3415,7 @@ printf(" IPMB-0 Hub Descriptor Count: 0x%02x", record->data[offset++]); @@ -92,80 +48,53 @@ ipmi_chassis.c:724: warning: format '%08X' expects type 'unsigned int', but argu (feature > 1) & 1, (feature&1)?"Source":"Receiver"); printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", family, accuracy); -- printf("\tFRQ: %-9d - min: %-9d - max: %-9d\n", -+ printf("\tFRQ: %-9lu - min: %-9lu - max: %-9lu\n", +- printf("\tFRQ: %-9ld - min: %-9ld - max: %-9ld\n", ++ printf("\tFRQ: %-9lu - min: %-9ld - max: %-9ld\n", freq, min_freq, max_freq); } printf("\n"); -@@ -3902,9 +3898,9 @@ - else{ - int record_count = 0; - -- if ( verbose == LOG_DEBUG ){ -- printf( "start multi offset = 0x%02x\n", multi_offset ); -- } -+ if ( verbose == LOG_DEBUG ) -+ printf( "start multi offset = 0x%02lx\n", multi_offset ); -+ - /*the offset value is in multiple of 8 bytes.*/ - multi_offset = multi_offset * 8; - fseek ( input_file, multi_offset, SEEK_SET ); ---- ipmitool-1.8.11/lib/ipmi_fwum.c -+++ ipmitool-1.8.11/lib/ipmi_fwum.c +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c ./lib/ipmi_fwum.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c 2013-02-28 13:53:34.644417793 +0100 ++++ ./lib/ipmi_fwum.c 2013-02-28 14:04:34.910468572 +0100 @@ -480,7 +480,7 @@ - - if(pFileHandle) - { -- if(fseek(pFileHandle, 0L , SEEK_END) == (unsigned int) NULL) -+ if(fseek(pFileHandle, 0L , SEEK_END) == 0) - { - *pFileSize = ftell(pFileHandle); - + + if(pFileHandle) + { +- if(fseek(pFileHandle, 0L , SEEK_END) == (unsigned int) NULL) ++ if(fseek(pFileHandle, 0L , SEEK_END) == 0) + { + *pFileSize = ftell(pFileHandle); + @@ -1307,7 +1307,6 @@ - unsigned long lastAddress = 0; - unsigned char sequenceNumber = 0; - unsigned char retry = FWUM_MAX_UPLOAD_RETRY; -- unsigned char isLengthValid = 1; - - do - { ---- ipmitool-1.8.11/lib/ipmi_hpmfwupg.c -+++ ipmitool-1.8.11/lib/ipmi_hpmfwupg.c -@@ -1220,7 +1220,6 @@ + unsigned long lastAddress = 0; + unsigned char sequenceNumber = 0; + unsigned char retry = FWUM_MAX_UPLOAD_RETRY; +- unsigned char isLengthValid = 1; + + do + { +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_hpmfwupg.c ./lib/ipmi_hpmfwupg.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_hpmfwupg.c 2013-02-28 13:52:11.893152359 +0100 ++++ ./lib/ipmi_hpmfwupg.c 2013-02-28 14:01:19.162746040 +0100 +@@ -1286,7 +1286,6 @@ *****************************************************************************/ int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option) { - struct HpmfwupgUpgradeCtx fwupgCtx; struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd; - int rc = HPMFWUPG_SUCCESS; + int rc = HPMFWUPG_SUCCESS; int componentId = 0; -@@ -1363,7 +1362,6 @@ +@@ -1445,7 +1444,6 @@ int activate,int componentToUpload, int option) { int rc = HPMFWUPG_SUCCESS; - struct HpmfwupgImageHeader imageHeader; struct HpmfwupgUpgradeCtx fwupgCtx; - + /* -@@ -1847,8 +1845,6 @@ - unsigned char componentIdByte = 0x00; - VERSIONINFO *pVersionInfo; - -- struct HpmfwupgGetComponentPropertiesCtx getCompProp; -- - /* Save component ID on which the upload is done */ - componentIdByte = pActionRecord->components.ComponentBits.byte; - while ((componentIdByte>>=1)!=0) -@@ -2061,7 +2057,6 @@ - struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd; - struct HpmfwupgUploadFirmwareBlockCtx uploadCmd; - struct HpmfwupgFinishFirmwareUploadCtx finishCmd; -- struct HpmfwupgGetComponentPropertiesCtx getCompProp; - VERSIONINFO *pVersionInfo; - - unsigned char* pData, *pDataInitial; ---- ipmitool-1.8.11/lib/ipmi_isol.c -+++ ipmitool-1.8.11/lib/ipmi_isol.c +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_isol.c ./lib/ipmi_isol.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_isol.c 2012-01-21 06:32:24.000000000 +0100 ++++ ./lib/ipmi_isol.c 2013-02-28 14:01:19.162746040 +0100 @@ -413,7 +413,6 @@ struct ipmi_rs * rsp; struct ipmi_rq req; @@ -174,115 +103,40 @@ ipmi_chassis.c:724: warning: format '%08X' expects type 'unsigned int', but argu memset(&req, 0, sizeof(req)); req.msg.netfn = IPMI_NETFN_ISOL; ---- ipmitool-1.8.11/lib/ipmi_picmg.c -+++ ipmitool-1.8.11/lib/ipmi_picmg.c -@@ -395,11 +395,11 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_picmg.c ./lib/ipmi_picmg.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_picmg.c 2012-08-03 19:07:07.000000000 +0200 ++++ ./lib/ipmi_picmg.c 2013-02-28 14:18:31.523468906 +0100 +@@ -432,7 +432,7 @@ } else if (d->type >= 0x06 && d->type <= 0xef) { -- printf("Reserved\n",d->type); +- printf("Reserved\n"); + printf("Reserved %d\n",d->type); } else if (d->type >= 0xf0 && d->type <= 0xfe) { -- printf("OEM GUID Definition\n",d->type); -+ printf("OEM GUID Definition %d\n",d->type); - } - else - { -@@ -471,7 +471,6 @@ - struct ipmi_rq req; - - unsigned char msg_data[6]; -- struct fru_picmgext_link_desc* d; - - memset(&req, 0, sizeof(req)); - -@@ -762,7 +761,7 @@ - return -1; +@@ -1201,7 +1201,7 @@ + oemval2str( rsp->data[3], rsp->data[4], + picmg_clk_accuracy_vals)); + +- printf(" - Freq: %ld\n", freq); ++ printf(" - Freq: %lu\n", freq); + } + } } - -- printf("LED Color Capabilities: ", rsp->data[1] ); -+ printf("LED Color Capabilities: "); - for ( i=0 ; i<8 ; i++ ) { - if ( rsp->data[1] & (0x01 << i) ) { - printf("%s, ", led_color_str[ i ]); -@@ -945,7 +944,6 @@ - int - ipmi_picmg_set_power_level(struct ipmi_intf * intf, int argc, char ** argv) - { -- int i; - struct ipmi_rs * rsp; - struct ipmi_rq req; - -@@ -1020,7 +1018,6 @@ - int - ipmi_picmg_clk_get(struct ipmi_intf * intf, int argc, char ** argv) - { -- int i; - struct ipmi_rs * rsp; - struct ipmi_rq req; - -@@ -1073,7 +1070,7 @@ - printf(" - Index: %d\n", rsp->data[2]); - printf(" - Family: %d\n", rsp->data[3]); - printf(" - AccLVL: %d\n", rsp->data[4]); -- printf(" - Freq: %d\n", freq); -+ printf(" - Freq: %lu\n", freq); - } - - return 0; -@@ -1083,7 +1080,6 @@ - int - ipmi_picmg_clk_set(struct ipmi_intf * intf, int argc, char ** argv) - { -- int i; - struct ipmi_rs * rsp; - struct ipmi_rq req; - -@@ -1115,10 +1111,10 @@ - #if 1 - printf("## ID: %d\n", msg_data[1]); - printf("## index: %d\n", msg_data[2]); --printf("## setting: 0x02x\n", msg_data[3]); -+printf("## setting: %0x02x\n", msg_data[3]); +@@ -1258,7 +1258,7 @@ + printf("## setting: 0x%02x\n", msg_data[3]); printf("## family: %d\n", msg_data[4]); printf("## acc: %d\n", msg_data[5]); --printf("## freq: %d\n", freq ); +-printf("## freq: %ld\n", freq ); +printf("## freq: %lu\n", freq ); printf("## res: %d\n", msg_data[10]); #endif -@@ -1528,15 +1524,10 @@ - else if (!strncmp(argv[0], "clk", 3)) { - if (argc > 1) { - if (!strncmp(argv[1], "get", 3)) { -- if (argc > 2) { -- unsigned char clk_id; -- unsigned char clk_res; -- -+ if (argc > 2) - rc = ipmi_picmg_clk_get(intf, argc-1, &(argv[2])); -- } - else { - printf("clk get []\n"); -- - return -1; - } - } ---- ipmitool-1.8.11/lib/ipmi_sdr.c -+++ ipmitool-1.8.11/lib/ipmi_sdr.c -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - #if HAVE_CONFIG_H - # include ---- ipmitool-1.8.11/lib/ipmi_sdradd.c -+++ ipmitool-1.8.11/lib/ipmi_sdradd.c -@@ -325,7 +325,6 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_sdradd.c ./lib/ipmi_sdradd.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_sdradd.c 2013-02-28 13:55:22.988692984 +0100 ++++ ./lib/ipmi_sdradd.c 2013-02-28 14:01:19.166746197 +0100 +@@ -573,7 +573,6 @@ static int ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue) { @@ -290,13 +144,14 @@ ipmi_chassis.c:724: warning: format '%08X' expects type 'unsigned int', but argu int rc = 0; int fd; uint8_t binHdr[5]; ---- ipmitool-1.8.11/src/ipmievd.c -+++ ipmitool-1.8.11/src/ipmievd.c -@@ -665,6 +665,7 @@ - } - sleep(selwatch_timeout); - } -+ return 0; - } - /*************************************************************************/ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_sdr.c ./lib/ipmi_sdr.c +--- ../orig-ipmitool-1.8.12/lib/ipmi_sdr.c 2012-07-23 16:52:57.000000000 +0200 ++++ ./lib/ipmi_sdr.c 2013-02-28 14:01:19.166746197 +0100 +@@ -52,6 +52,7 @@ + #include + #include + #include ++#include + #if HAVE_CONFIG_H + # include