Skip to content

Commit

Permalink
ipmiutil: add upstream build patch
Browse files Browse the repository at this point in the history
Signed-off-by: Rui Chen <[email protected]>
  • Loading branch information
chenrui333 committed Sep 18, 2024
1 parent faafeeb commit 7a21a27
Showing 1 changed file with 56 additions and 1 deletion.
57 changes: 56 additions & 1 deletion Formula/i/ipmiutil.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ class Ipmiutil < Formula
desc "IPMI server management utility"
homepage "https://ipmiutil.sourceforge.net/"
url "https://downloads.sourceforge.net/project/ipmiutil/ipmiutil-3.1.9.tar.gz"
sha256 "c0dacc4ad506538f59ed45373b775748deddddc36e6d3c303f5069a59cacab08"
sha256 "5ae99bdd1296a8e25cea839784ec39ebca57b0e3701b2d440b8e02e22dc4bc95"
license all_of: ["BSD-2-Clause", "BSD-3-Clause", "GPL-2.0-or-later"]

bottle do
Expand All @@ -21,7 +21,13 @@ class Ipmiutil < Formula

conflicts_with "renameutils", because: "both install `icmd` binaries"

# add upstream build patch, upstream bug report, https://sourceforge.net/p/ipmiutil/support-requests/61/
patch :DATA

def install
# Workaround for newer Clang
ENV.append "CC", "-Wno-implicit-function-declaration" if DevelopmentTools.clang_build_version >= 1403

# Darwin does not exist only on PowerPC
if OS.mac?
inreplace "configure.ac", "test \"$archp\" = \"powerpc\"", "true"
Expand All @@ -48,3 +54,52 @@ def install
system bin/"ipmiutil", "delloem", "help"
end
end

__END__
diff --git a/util/oem_dell.c b/util/oem_dell.c
index b474ee3..b4d8112 100644
--- a/util/oem_dell.c
+++ b/util/oem_dell.c
@@ -4,6 +4,7 @@
*
* Change history:
* 08/17/2011 ARCress - included in ipmiutil source tree
+ * 09/18/2024 ARCress - fix macos compile error with vFlashstr
*
*/
/******************************************************************
@@ -157,8 +158,14 @@ static uint8_t SetLEDSupported=0;

volatile uint8_t IMC_Type = IMC_IDRAC_10G;

+typedef struct
+{
+ int val;
+ char *str;
+} vFlashstr;

-const struct vFlashstr vFlash_completion_code_vals[] = {
+// const struct vFlashstr vFlash_completion_code_vals[] = {
+const vFlashstr vFlash_completion_code_vals[] = {
{0x00, "SUCCESS"},
{0x01, "NO_SD_CARD"},
{0x63, "UNKNOWN_ERROR"},
@@ -250,7 +257,8 @@ static void ipmi_powermonitor_usage(void);

/* vFlash Function prototypes */
static int ipmi_delloem_vFlash_main(void * intf, int argc, char ** argv);
-const char * get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs);
+// const char * get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs);
+const char * get_vFlash_compcode_str(uint8_t vflashcompcode, const vFlashstr *vs);
static int ipmi_get_sd_card_info(void* intf);
static int ipmi_delloem_vFlash_process(void* intf, int current_arg, char ** argv);
static void ipmi_vFlash_usage(void);
@@ -4818,7 +4826,7 @@ static int ipmi_delloem_vFlash_main (void * intf, int argc, char ** argv)
*
******************************************************************/
const char *
-get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs)
+get_vFlash_compcode_str(uint8_t vflashcompcode, const vFlashstr *vs)
{
static char un_str[32];
int i;

0 comments on commit 7a21a27

Please sign in to comment.