rosa/hakurei
6
4
Fork 2
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 19 Wiki Activity

internal/rosa: do not register stage0
All checks were successful
Test / Create distribution (push) Successful in 1m5s
Details
Test / Sandbox (push) Successful in 2m54s
Details
Test / ShareFS (push) Successful in 3m42s
Details
Test / Hakurei (push) Successful in 3m56s
Details
Test / Sandbox (race detector) (push) Successful in 5m23s
Details
Test / Hakurei (race detector) (push) Successful in 6m30s
Details
Test / Flake checks (push) Successful in 1m21s
Details

Browse Source 
Nothing can depend on this, so remove it from the namespace.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
Ophestra
2026-05-21 22:19:10 +09:00
parent 0914569e62
commit 0615899e56
5 changed files with 49 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/mbf/main.go
View File

@@ -91,7 +91,7 @@ func main() {
addr net.UnixAddr
)
c := command.New(os.Stderr, log.Printf, "mbf", func([]string) error {
if !rosa.Native().HasStage0() {
if !rosa.Native().HasStageEarly() {
return pkg.UnsupportedArchError(runtime.GOARCH)
}
@@ -131,7 +131,7 @@ func main() {
}
rosa.Native().DropCaches(flagArch, flags)
if !rosa.Native().HasStage0() {
if !rosa.Native().HasStageEarly() {
return pkg.UnsupportedArchError(flagArch)
}
}
@@ -452,8 +452,9 @@ func main() {
checksum [2]unique.Handle[pkg.Checksum]
)
_llvm := rosa.H("llvm")
if err = cm.Do(func(cache *pkg.Cache) (err error) {
_, llvm := rosa.Native().New(s - 2).Load(rosa.LLVM)
_, llvm := rosa.Native().New(s - 2).Load(_llvm)
pathname, _, err = cache.Cure(llvm)
return
}); err != nil {
@@ -462,7 +463,7 @@ func main() {
log.Println("stage1:", pathname)
if err = cm.Do(func(cache *pkg.Cache) (err error) {
_, llvm := rosa.Native().New(s - 1).Load(rosa.LLVM)
_, llvm := rosa.Native().New(s - 1).Load(_llvm)
pathname, checksum[0], err = cache.Cure(llvm)
return
}); err != nil {
@@ -470,7 +471,7 @@ func main() {
}
log.Println("stage2:", pathname)
if err = cm.Do(func(cache *pkg.Cache) (err error) {
_, llvm := rosa.Native().New(s).Load(rosa.LLVM)
_, llvm := rosa.Native().New(s).Load(_llvm)
pathname, checksum[1], err = cache.Cure(llvm)
return
}); err != nil {
@@ -492,8 +493,7 @@ func main() {
if flagStage0 {
if err = cm.Do(func(cache *pkg.Cache) (err error) {
_, stage0 := rosa.Native().New(s).Load(rosa.Stage0)
pathname, _, err = cache.Cure(stage0)
pathname, _, err = cache.Cure(rosa.Native().Std().NewStage0())
return
}); err != nil {
return
@@ -767,14 +767,14 @@ func main() {
}
}
base := rosa.LLVM
base := rosa.H("llvm")
if !flagWithToolchain {
base = rosa.H("musl")
}
handles = append(handles,
base,
rosa.Mksh,
rosa.Toybox,
rosa.H("mksh"),
rosa.H("toybox"),
)
root := make(pkg.Collect, 0, 6+len(args))