rpms/ipmitool
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust patch to apply

Browse Source 
Resolves: rhbz2224578
This commit is contained in:
Pavel Cahyna 2023-07-27 15:32:56 +02:00
parent 83b46ce9f7
commit 59ee65304f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
0023-move-static-objects-to-source-file.patch
View File

@ -18,6 +18,7 @@ diff --git a/include/ipmitool/ipmi_sdr.h b/include/ipmitool/ipmi_sdr.h
index 9001e59..5e6afd3 100644 index 9001e59..5e6afd3 100644
--- a/include/ipmitool/ipmi_sdr.h --- a/include/ipmitool/ipmi_sdr.h
+++ b/include/ipmitool/ipmi_sdr.h +++ b/include/ipmitool/ipmi_sdr.h
@@ -773,50 +773,7 @@ struct sdr_record_list { @@ -773,50 +773,7 @@ struct sdr_record_list {
#pragma pack(0) #pragma pack(0)
#endif #endif
@ -25,7 +26,7 @@ index 9001e59..5e6afd3 100644
- -
-/* unit description codes (IPMI v1.5 section 37.16) */ -/* unit description codes (IPMI v1.5 section 37.16) */
-#define UNIT_MAX 0x90 -#define UNIT_MAX 0x90
-static const char *__UNUSED__(unit_desc[]) = { -static const char *unit_desc[] __attribute__ ((unused)) = {
-"unspecified", -"unspecified",
- "degrees C", "degrees F", "degrees K", - "degrees C", "degrees F", "degrees K",
- "Volts", "Amps", "Watts", "Joules", - "Volts", "Amps", "Watts", "Joules",
@ -50,7 +51,7 @@ index 9001e59..5e6afd3 100644
-/* sensor type codes (IPMI v1.5 table 36.3) -/* sensor type codes (IPMI v1.5 table 36.3)
- / Updated to v2.0 Table 42-3, Sensor Type Codes */ - / Updated to v2.0 Table 42-3, Sensor Type Codes */
#define SENSOR_TYPE_MAX 0x2C #define SENSOR_TYPE_MAX 0x2C
-static const char *__UNUSED__(sensor_type_desc[]) = { -static const char *sensor_type_desc[] __attribute__ ((unused)) = {
-"reserved", -"reserved",
- "Temperature", "Voltage", "Current", "Fan", - "Temperature", "Voltage", "Current", "Fan",
- "Physical Security", "Platform Security", "Processor", - "Physical Security", "Platform Security", "Processor",
@ -68,7 +69,7 @@ index 9001e59..5e6afd3 100644
- "Version Change", "FRU State" }; - "Version Change", "FRU State" };
struct sensor_reading { struct sensor_reading {
char s_id[17]; /* name of the sensor */ char s_id[33]; /* name of the sensor */
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
index d51c174..eb40b36 100644 index d51c174..eb40b36 100644
--- a/lib/ipmi_sdr.c --- a/lib/ipmi_sdr.c