diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-17 16:44:13 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-17 17:50:30 +0900 |
| commit | 38bc2c750842826c5af4f66abe3e1905258cd274 (patch) | |
| tree | 75e1d17961fd980ff8b20a9dfd937789de10836e /internal/rosa/toybox.go | |
| parent | 30eb0d6a613ad268f6805ccbcdcabf158e7f526f (diff) | |
internal/rosa: pass stage alongside state
This cleans up many function signatures.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/toybox.go')
| -rw-r--r-- | internal/rosa/toybox.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/internal/rosa/toybox.go b/internal/rosa/toybox.go index d5e12380..cb97e8dc 100644 --- a/internal/rosa/toybox.go +++ b/internal/rosa/toybox.go @@ -2,12 +2,12 @@ package rosa import "hakurei.app/internal/pkg" -func (s *S) newToybox(t Toolchain, suffix, script string) (pkg.Artifact, string) { +func (t Toolchain) newToybox(suffix, script string) (pkg.Artifact, string) { const ( version = "0.8.13" checksum = "rZ1V1ATDte2WeQZanxLVoiRGdfPXhMlEo5-exX-e-ml8cGn9qOv0ABEUVZpX3wTI" ) - return s.NewPackage(t, "toybox"+suffix, version, newTar( + return t.NewPackage("toybox"+suffix, version, newTar( "https://landley.net/toybox/downloads/toybox-"+version+".tar.gz", checksum, pkg.TarGzip, @@ -41,7 +41,7 @@ sed -i \ 's/^CONFIG_TOYBOX_ZHELP=y$/CONFIG_TOYBOX_ZHELP=0/' \ .config ` + script, - SkipCheck: t.isStage0(), + SkipCheck: t.stage.isStage0(), Check: []string{ "USER=cure", "tests", @@ -60,8 +60,8 @@ ln -s ../../system/bin/env /work/usr/bin } func init() { native.MustRegister(&Artifact{ - f: func(t Toolchain, s *S) (pkg.Artifact, string) { - return s.newToybox(t, "", "") + f: func(t Toolchain) (pkg.Artifact, string) { + return t.newToybox("", "") }, Name: "toybox", @@ -72,8 +72,8 @@ func init() { }) native.MustRegister(&Artifact{ - f: func(t Toolchain, s *S) (pkg.Artifact, string) { - return s.newToybox(t, "-early", ` + f: func(t Toolchain) (pkg.Artifact, string) { + return t.newToybox("-early", ` echo ' CONFIG_EXPR=y CONFIG_TR=y |