internal/rosa: pass stage alongside state

This cleans up many function signatures.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-05-17 16:44:13 +09:00
parent 30eb0d6a61
commit 38bc2c7508
89 changed files with 563 additions and 558 deletions

View File

@@ -5,17 +5,17 @@ import (
"hakurei.app/internal/pkg"
)
func (t Toolchain) newStage0(s *S) (pkg.Artifact, string) {
return s.New(t, "rosa-stage0", 0, s.AppendPresets(t, nil,
func (t Toolchain) newStage0() (pkg.Artifact, string) {
return t.New("rosa-stage0", 0, t.Append(nil,
Bzip2,
), nil, nil, `
umask 377
tar \
-vjc \
-C /stage0 \
-f /work/stage0-`+s.triple()+`.tar.bz2 \
-f /work/stage0-`+t.triple()+`.tar.bz2 \
.
`, pkg.Path(fhs.AbsRoot.Append("stage0"), false, s.AppendPresets(t, nil,
`, pkg.Path(fhs.AbsRoot.Append("stage0"), false, t.Append(nil,
LLVM,
Mksh,
toyboxEarly,
@@ -33,15 +33,15 @@ func init() {
func init() {
const version = "20260504"
native.MustRegister(&Artifact{
f: func(_ Toolchain, s *S) (pkg.Artifact, string) {
f: func(t Toolchain) (pkg.Artifact, string) {
return newTar(
"https://hakurei.app/seed/"+version+"/"+
"stage0-"+s.triple()+".tar.bz2",
"stage0-"+t.triple()+".tar.bz2",
perArch[string]{
"amd64": "IQjFDkiAVLo1XzflgMMiLP3gnVY2hhDMTzl-QqJDCQhcLQ3lLtRzjI5WCxGyW_lk",
"arm64": "6fmwl2Umx2QssKQvxxb1JOGkAjzfA_MXKku0jVdGjYGb35OvwEVA5NYtd0HIy3yH",
"riscv64": "Z2ODV0rIoo9iQRUIu35bsaOBeXc_9qQfGcyb2aGneatzNUJlXh5emSpEV2bOklUL",
}.unwrap(s),
}.unwrap(t.S),
pkg.TarBzip2,
), version
},
@@ -55,7 +55,7 @@ func init() {
func HasStage0() (ok bool) {
func() {
defer func() { ok = recover() == nil }()
native.Load(toolchainStage0, stage0Dist)
native.New(stageEarly).Load(stage0Dist)
}()
return
}