forked from pool/ipmitool
Thomas Renninger
31281a73e0
1) exchange-bmc-os-info - fate#315999
Shows SLES string as OS in the service processor info
2) bmc-snmp-proxy - fate#316000
Exports sel (BMC Error log) via snmpd
3) ipmievd - fate#316002
Logs sel to syslog
1. and 2. are very Dell specific and should not get enabled by default
3. got converted to a native systemd service. Still needs autoconf
adjusting to get send mainline
1. and 2. have somewhat bigger Init V init scripts and time was not
enough to convert them. Therefore they were added via insserv
and friends as well
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=20
119 lines
4.2 KiB
Diff
119 lines
4.2 KiB
Diff
Index: ipmitool-1.8.13/lib/ipmi_ekanalyzer.c
|
|
===================================================================
|
|
--- ipmitool-1.8.13.orig/lib/ipmi_ekanalyzer.c
|
|
+++ ipmitool-1.8.13/lib/ipmi_ekanalyzer.c
|
|
@@ -397,7 +397,6 @@ ipmi_ekanalyzer_usage( void )
|
|
static int
|
|
ipmi_ek_get_file_type( char * argument )
|
|
{
|
|
- int index_name=0;
|
|
int filetype = ERROR_STATUS;
|
|
|
|
if( strlen (argument) > MIN_ARGUMENT ){
|
|
@@ -3383,7 +3382,7 @@ ipmi_ek_display_board_p2p_record( struct
|
|
offset += sizeof(struct fru_picmgext_guid);
|
|
}
|
|
|
|
- for ( offset;
|
|
+ for ( ;
|
|
offset < record->header.len;
|
|
offset += sizeof(struct fru_picmgext_link_desc)
|
|
) {
|
|
@@ -3552,7 +3551,7 @@ ipmi_ek_display_radial_ipmb0_record( str
|
|
|
|
printf(" IPMB-0 Hub Descriptor Count: 0x%02x", record->data[offset++]);
|
|
if (record->data[offset] > 0){
|
|
- for (offset; offset < record->header.len;){
|
|
+ for (; offset < record->header.len;){
|
|
unsigned char entry_count = 0;
|
|
printf(" IPMB-0 Hub Descriptor\n");
|
|
printf("\tHardware Address: 0x%02x\n", record->data[offset++]);
|
|
@@ -3995,7 +3994,7 @@ ipmi_ek_display_clock_config_record( str
|
|
(feature > 1) & 1,
|
|
(feature&1)?"Source":"Receiver");
|
|
printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", family, accuracy);
|
|
- printf("\tFRQ: %-9ld - min: %-9ld - max: %-9ld\n",
|
|
+ printf("\tFRQ: %-9lu - min: %-9ld - max: %-9ld\n",
|
|
freq, min_freq, max_freq);
|
|
}
|
|
printf("\n");
|
|
Index: ipmitool-1.8.13/lib/ipmi_fwum.c
|
|
===================================================================
|
|
--- ipmitool-1.8.13.orig/lib/ipmi_fwum.c
|
|
+++ ipmitool-1.8.13/lib/ipmi_fwum.c
|
|
@@ -861,7 +861,6 @@ KfwumUploadFirmware(struct ipmi_intf *in
|
|
unsigned long lastAddress = 0;
|
|
unsigned char sequenceNumber = 0;
|
|
unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
|
|
- unsigned char isLengthValid = 1;
|
|
do {
|
|
writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize;
|
|
/* Reach the end */
|
|
Index: ipmitool-1.8.13/lib/ipmi_isol.c
|
|
===================================================================
|
|
--- ipmitool-1.8.13.orig/lib/ipmi_isol.c
|
|
+++ ipmitool-1.8.13/lib/ipmi_isol.c
|
|
@@ -413,7 +413,6 @@ ipmi_isol_deactivate(struct ipmi_intf *
|
|
struct ipmi_rs * rsp;
|
|
struct ipmi_rq req;
|
|
uint8_t data[6];
|
|
- struct isol_config_parameters params;
|
|
|
|
memset(&req, 0, sizeof(req));
|
|
req.msg.netfn = IPMI_NETFN_ISOL;
|
|
Index: ipmitool-1.8.13/lib/ipmi_picmg.c
|
|
===================================================================
|
|
--- ipmitool-1.8.13.orig/lib/ipmi_picmg.c
|
|
+++ ipmitool-1.8.13/lib/ipmi_picmg.c
|
|
@@ -878,7 +878,7 @@ ipmi_picmg_portstate_get(struct ipmi_int
|
|
}
|
|
else if (d->type >= 0x06 && d->type <= 0xef)
|
|
{
|
|
- printf("Reserved\n");
|
|
+ printf("Reserved %d\n",d->type);
|
|
}
|
|
else if (d->type >= 0xf0 && d->type <= 0xfe)
|
|
{
|
|
@@ -1690,7 +1690,7 @@ ipmi_picmg_clk_get(struct ipmi_intf * in
|
|
oemval2str( rsp->data[3], rsp->data[4],
|
|
picmg_clk_accuracy_vals));
|
|
|
|
- printf(" - Freq: %ld\n", freq);
|
|
+ printf(" - Freq: %lu\n", freq);
|
|
}
|
|
}
|
|
}
|
|
@@ -1751,7 +1751,7 @@ printf("## index: %d\n", msg_data[2]);
|
|
printf("## setting: 0x%02x\n", msg_data[3]);
|
|
printf("## family: %d\n", msg_data[4]);
|
|
printf("## acc: %d\n", msg_data[5]);
|
|
-printf("## freq: %ld\n", freq );
|
|
+printf("## freq: %lu\n", freq );
|
|
printf("## res: %d\n", msg_data[10]);
|
|
#endif
|
|
|
|
Index: ipmitool-1.8.13/lib/ipmi_sdradd.c
|
|
===================================================================
|
|
--- ipmitool-1.8.13.orig/lib/ipmi_sdradd.c
|
|
+++ ipmitool-1.8.13/lib/ipmi_sdradd.c
|
|
@@ -576,7 +576,6 @@ ipmi_sdr_add_from_list(struct ipmi_intf
|
|
static int
|
|
ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
|
|
{
|
|
- struct sdr_get_rs header;
|
|
int rc = 0;
|
|
int fd;
|
|
uint8_t binHdr[5];
|
|
Index: ipmitool-1.8.13/lib/ipmi_sdr.c
|
|
===================================================================
|
|
--- ipmitool-1.8.13.orig/lib/ipmi_sdr.c
|
|
+++ ipmitool-1.8.13/lib/ipmi_sdr.c
|
|
@@ -52,6 +52,7 @@
|
|
#include <ipmitool/ipmi_entity.h>
|
|
#include <ipmitool/ipmi_constants.h>
|
|
#include <ipmitool/ipmi_strings.h>
|
|
+#include <ipmitool/ipmi_sensor.h>
|
|
|
|
#if HAVE_CONFIG_H
|
|
# include <config.h>
|