Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ipmiutil: add upstream build patch #191136

Merged
merged 2 commits into from
Oct 9, 2024
Merged

ipmiutil: add upstream build patch #191136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc2213
ipmiutil: add upstream build patch
chenrui333 Sep 18, 2024
782be6a
ipmiutil: update 3.1.9 bottle.
BrewTestBot Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 63 additions & 6 deletions Formula/i/ipmiutil.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@ 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
sha256 cellar: :any_skip_relocation, arm64_big_sur: "ed89f20a5b615ab13fa8fc8049ecd0b8c0eec598cd3fb319f21df4fda98bc5b9"
sha256 cellar: :any_skip_relocation, ventura: "6f120c16676bddea65c9863cf3cebeccb3ce3ae9098471bf401b86a715826cd4"
sha256 cellar: :any_skip_relocation, monterey: "d4e88aeeb8d6f294103d421999bbb6c5d49941cda1a12866997ae2b45e044846"
sha256 cellar: :any_skip_relocation, big_sur: "ebd7f2895182e420f13eb5e8bb814a01b69b751596ef3c65b0e60df320cba2ea"
sha256 cellar: :any_skip_relocation, x86_64_linux: "10a444b399b0bd4486654bb914fde8db8140b63feda87fa9804845f099653a0a"
rebuild 1
sha256 cellar: :any_skip_relocation, arm64_sequoia: "cae2294a98966889ce7158ab6506ed7b1f87e6d981bff197e8c8a34c9f6ea9c3"
sha256 cellar: :any_skip_relocation, arm64_sonoma: "25a7bf60f294710207ada5b75c6cbbc0e7a5762ff06199151d676816dc9dd384"
sha256 cellar: :any_skip_relocation, arm64_ventura: "07ad84d82b2d7b16e484b81b8057e10911a82c880b9516dcad3b7e564028b6b4"
sha256 cellar: :any_skip_relocation, sonoma: "1a79a69b51f5ea2e478d2b912900e6713eb91d7006b0e9ec73d597efcf4b81fe"
sha256 cellar: :any_skip_relocation, ventura: "9d83f92e6b0c65b464c3cdaae66d13d7995fc875a76069180078758a1819048a"
sha256 cellar: :any_skip_relocation, x86_64_linux: "1a68d7956c2c4f06a13bd4ba7d67a05e3ca5e771030463db32b49d7426a0fdfc"
end

on_macos do
Expand All @@ -21,7 +23,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 +56,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;
Loading