From d9ebaf20f8e71f043d2387a42d273dadc5d536b5 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sat, 24 Jan 2026 11:48:19 +0900 Subject: internal/rosa: stage3 special case helper This makes it cleaner to specify non-stage3 and stage3-exclusive dependencies. Signed-off-by: Ophestra --- internal/rosa/busybox.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'internal/rosa/busybox.go') diff --git a/internal/rosa/busybox.go b/internal/rosa/busybox.go index d5eabe7d..b4fb2d3f 100644 --- a/internal/rosa/busybox.go +++ b/internal/rosa/busybox.go @@ -108,18 +108,15 @@ func (t Toolchain) NewBusybox() pkg.Artifact { checksum = "Ial94Tnt7esJ_YEeb0AxunVL6MGYFyOw7Rtu2o87CXCi1TLrc6rlznVsN1rZk7it" ) - extra := []pkg.Artifact{ - t.NewMake(), - t.NewKernelHeaders(), - } var env []string - if t == toolchainStage3 { - extra = nil env = append(env, "EXTRA_LDFLAGS=-static") } - return t.New("busybox-"+version, extra, nil, slices.Concat([]string{ + return t.New("busybox-"+version, stage3Concat(t, []pkg.Artifact{}, + t.NewMake(), + t.NewKernelHeaders(), + ), nil, slices.Concat([]string{ "ROSA_BUSYBOX_ENABLE=" + strings.Join([]string{ "STATIC", "PIE", -- cgit v1.3.1