Skip to content

Commit 84526d2

Browse files
rahulbabu95rahulbabu95
authored
Bump bmclib in Rufio (#5318)
Signed-off-by: Rahul <rahulbabu95@gmail.com>
1 parent c3a9f6a commit 84526d2

File tree

2 files changed

+33
-34
lines changed

2 files changed

+33
-34
lines changed

‎projects/tinkerbell/rufio/CHECKSUMS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
4872cf19447e942b335ba41d47da2c444c888c374f236f7013e3b3c2c7984aba _output/bin/rufio/linux-amd64/manager
2-
e4e4947f2dea6d6aa825bfed5e23a1f2f08920a94fac9db4aa55ac5c5cdbced9 _output/bin/rufio/linux-arm64/manager
1+
54f731a002b5bf5c1784e1d64c1257079b22050954256b39ce0ff9e28b427ec7 _output/bin/rufio/linux-amd64/manager
2+
dc71916ecb43cc08e7ddf423cf51add1cbc763c84eb1bf45762aa81f6dfc8faa _output/bin/rufio/linux-arm64/manager

projects/tinkerbell/rufio/patches/0001-fix-Replace-bmclib-with-fork-for-iDRAC10-gofish-comp.patch renamed to projects/tinkerbell/rufio/patches/0001-Bump-bmclib-to-3269f94-gofish-v0.21.6.patch

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,70 @@
1-
From f195ef9a40738a58bbdc1a9c6b621b008f556738 Mon Sep 17 00:00:00 2001
1+
From d64f5eafad4ee7d2cbd5470bb30132442170648a Mon Sep 17 00:00:00 2001
22
From: Rahul Ganesh <rahulgab@amazon.com>
3-
Date: Thu, 5 Mar 2026 14:54:24 -0800
4-
Subject: [PATCH 1/1] fix: Replace bmclib with fork for iDRAC10 gofish
5-
compatibility
3+
Date: Thu, 16 Apr 2026 17:33:22 -0700
4+
Subject: [PATCH] Bump bmclib to 3269f94 (gofish v0.21.6)
65

7-
Point bmclib to a fork (github.com/rahulbabu95/bmclib) that includes
8-
gofish v0.20.1+ with iDRAC10 compatibility fixes from gofish PRs #510 and #511 The fork adapts bmclib to the new gofish
9-
API (schemas package restructure), mirroring bmc-toolbox/bmclib#432.
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.
108

11-
This is a temporary patch until upstream bmclib merges PR #432 and
12-
rufio bumps to a version that includes it.
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.
1316

1417
Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
1518
---
16-
go.mod | 4 +++-
19+
go.mod | 4 ++--
1720
go.sum | 8 ++++----
18-
2 files changed, 7 insertions(+), 5 deletions(-)
21+
2 files changed, 6 insertions(+), 6 deletions(-)
1922

2023
diff --git a/go.mod b/go.mod
21-
index fe4bd66..3847997 100644
24+
index fe4bd66..bc7179d 100644
2225
--- a/go.mod
2326
+++ 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
2436
@@ -63,7 +63,7 @@ require (
2537
github.com/prometheus/procfs v0.15.1 // indirect
2638
github.com/satori/go.uuid v1.2.0 // indirect
2739
github.com/spf13/pflag v1.0.5 // indirect
2840
- github.com/stmcginnis/gofish v0.20.0 // indirect
29-
+ github.com/stmcginnis/gofish v0.20.1-0.20260304143028-a1180d37929a // indirect
41+
+ github.com/stmcginnis/gofish v0.21.6 // indirect
3042
github.com/x448/float16 v0.8.4 // indirect
3143
go.opentelemetry.io/otel v1.29.0 // indirect
3244
go.opentelemetry.io/otel/trace v1.29.0 // indirect
33-
@@ -90,3 +90,5 @@ require (
34-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
35-
sigs.k8s.io/yaml v1.4.0 // indirect
36-
)
37-
+
38-
+replace github.com/bmc-toolbox/bmclib/v2 => github.com/rahulbabu95/bmclib/v2 v2.0.0-20260305223154-9e7e55bda2fe
3945
diff --git a/go.sum b/go.sum
40-
index dcc50c0..f78f824 100644
46+
index dcc50c0..a36dc2f 100644
4147
--- a/go.sum
4248
+++ b/go.sum
43-
@@ -8,8 +8,6 @@ github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22 h1:a0MBqYm44o0N
49+
@@ -8,8 +8,8 @@ github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22 h1:a0MBqYm44o0N
4450
github.com/VictorLowther/soap v0.0.0-20150314151524-8e36fca84b22/go.mod h1:/B7V22rcz4860iDqstGvia/2+IYWXf3/JdQCVd/1D2A=
4551
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
4652
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
4753
-github.com/bmc-toolbox/bmclib/v2 v2.3.5-0.20251010091507-63cb571e5597 h1:V8lDpeWcQXhlarTtD5op6++v5Dh6wO4WTBXq8ugNuj4=
4854
-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=
4957
github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d h1:5c0jhS9jNLm1t3GVEESsWv+p6recFRLGW90zp8HDIDs=
5058
github.com/bmc-toolbox/common v0.0.0-20250112191656-b6de52e8303d/go.mod h1:Cdnkm+edb6C0pVkyCrwh3JTXAe0iUF9diDG/DztPI9I=
5159
github.com/bombsimon/logrusr/v2 v2.0.1 h1:1VgxVNQMCvjirZIYaT9JYn6sAVGVEcNtRE0y4mvaOAM=
52-
@@ -128,6 +126,8 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G
53-
github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
54-
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
55-
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
56-
+github.com/rahulbabu95/bmclib/v2 v2.0.0-20260305223154-9e7e55bda2fe h1:BncNiKUfitjTVnxh9uJbm/PaCLJp9SVJIQGtf8BWJxk=
57-
+github.com/rahulbabu95/bmclib/v2 v2.0.0-20260305223154-9e7e55bda2fe/go.mod h1:3yBq8jDHT1OVa/iiJ1GKLttDlJB0dzF9Z5IH2hbaKHU=
58-
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
59-
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
60-
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
6160
@@ -139,8 +139,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
6261
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
6362
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
6463
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
6564
-github.com/stmcginnis/gofish v0.20.0 h1:hH2V2Qe898F2wWT1loApnkDUrXXiLKqbSlMaH3Y1n08=
6665
-github.com/stmcginnis/gofish v0.20.0/go.mod h1:PzF5i8ecRG9A2ol8XT64npKUunyraJ+7t0kYMpQAtqU=
67-
+github.com/stmcginnis/gofish v0.20.1-0.20260304143028-a1180d37929a h1:sgqQv6GMpYzDXI5O938qVzf22U2NT9n+ZwfGqFwj0fM=
68-
+github.com/stmcginnis/gofish v0.20.1-0.20260304143028-a1180d37929a/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=
6968
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
7069
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
7170
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=

0 commit comments

Comments
 (0)