Skip to content

Commit d3dd130

Browse files
peirulurahulbabu95
andauthored
Bump bmclib in Rufio (#5320)
Signed-off-by: Rahul <rahulbabu95@gmail.com> Co-authored-by: Rahul <rahulbabu95@gmail.com>
1 parent 099ba54 commit d3dd130

File tree

3 files changed

+74
-78
lines changed

3 files changed

+74
-78
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
c84d39d0c76f63474188210846cda962ab60e9d8817f3647445ac2c963b41dfd _output/bin/rufio/linux-amd64/manager
2-
d32a0357d2014c5c96f868d26f88781940ff48c79fc48ad106442e1a169b038b _output/bin/rufio/linux-arm64/manager
1+
54f731a002b5bf5c1784e1d64c1257079b22050954256b39ce0ff9e28b427ec7 _output/bin/rufio/linux-amd64/manager
2+
dc71916ecb43cc08e7ddf423cf51add1cbc763c84eb1bf45762aa81f6dfc8faa _output/bin/rufio/linux-arm64/manager
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
From d64f5eafad4ee7d2cbd5470bb30132442170648a Mon Sep 17 00:00:00 2001
2+
From: Rahul Ganesh <rahulgab@amazon.com>
3+
Date: Thu, 16 Apr 2026 17:33:22 -0700
4+
Subject: [PATCH] Bump bmclib to 3269f94 (gofish v0.21.6)
5+
6+
Update bmclib from fork pin to upstream bmc-toolbox/bmclib@3269f94
7+
which merges all prior fork patches and bumps gofish to v0.21.6.
8+
9+
Key fixes included via gofish v0.21.5/v0.21.6:
10+
- SetBoot tries main System resource before Settings URI,
11+
fixing one-time boot override on iDRAC 7.x-9.x
12+
- Fix multi-type JSON Schema properties resolving to wrong type
13+
14+
Also removes the rahulbabu95/bmclib fork replace directive since
15+
all fork commits (PRs #433, #434, #435) are now merged upstream.
16+
17+
Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
18+
---
19+
go.mod | 4 ++--
20+
go.sum | 8 ++++----
21+
2 files changed, 6 insertions(+), 6 deletions(-)
22+
23+
diff --git a/go.mod b/go.mod
24+
index fe4bd66..bc7179d 100644
25+
--- a/go.mod
26+
+++ b/go.mod
27+
@@ -6,7 +6,7 @@ toolchain go1.22.2
28+
29+
require (
30+
dario.cat/mergo v1.0.1
31+
- github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597
32+
+ github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9
33+
github.com/ccoveille/go-safecast v1.5.0
34+
github.com/go-logr/logr v1.4.2
35+
github.com/go-logr/zerologr v1.2.3
36+
@@ -63,7 +63,7 @@ require (
37+
github.com/prometheus/procfs v0.15.1 // indirect
38+
github.com/satori/go.uuid v1.2.0 // indirect
39+
github.com/spf13/pflag v1.0.5 // indirect
40+
- github.com/stmcginnis/gofish v0.20.0 // indirect
41+
+ github.com/stmcginnis/gofish v0.21.6 // indirect
42+
github.com/x448/float16 v0.8.4 // indirect
43+
go.opentelemetry.io/otel v1.29.0 // indirect
44+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
45+
diff --git a/go.sum b/go.sum
46+
index dcc50c0..a36dc2f 100644
47+
--- a/go.sum
48+
+++ b/go.sum
49+
@@ -8,8 +8,8 @@ github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22 h1:a0MBqYm44o0N
50+
github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22/go.mod h1:/B7V22rcz4860iDqstGvia/2+IYWXf3/JdQCVd/1D2A=
51+
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
52+
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
53+
-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597 h1:V8lDpeWcQXhlarTtD5op6++v5Dh6wO4WTBXq8ugNuj4=
54+
-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597/go.mod h1:2tYJD9JtY1tJxLHhslICrFOZhxE9O4gYMb1nJ5BKI5w=
55+
+github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9 h1:q4Sc06ok4ZDPuu6yYIkXDTJw8DEh5xA4Px9OQD087cg=
56+
+github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20260416064330-3269f94932e9/go.mod h1:NicaxDvwo1RbClp+6XPefZt28svygBT5wofYk/A1Sk0=
57+
github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d h1:5c0jhS9jNLm1t3GVEESsWv+p6recFRLGW90zp8HDIDs=
58+
github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d/go.mod h1:Cdnkm+edb6C0pVkyCrwh3JTXAe0iUF9diDG/DztPI9I=
59+
github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4mvaOAM=
60+
@@ -139,8 +139,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
61+
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
62+
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
63+
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
64+
-github.com/stmcginnis/gofish v0.20.0 h1:hH2V2Qe898F2wWT1loApnkDUrXXiLKqbSlMaH3Y1n08=
65+
-github.com/stmcginnis/gofish v0.20.0/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
66+
+github.com/stmcginnis/gofish v0.21.6 h1:jK3TGD6VANaAHKHypVNfD6io2nPrU+6eF8X4qARsTlY=
67+
+github.com/stmcginnis/gofish v0.21.6/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
68+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
69+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
70+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
71+
--
72+
2.46.0

projects/tinkerbell/rufio/patches/0001-fix-Replace-bmclib-with-fork-for-iDRAC10-gofish-comp.patch

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)