internal/rosa/make: migrate to helper interface
All checks were successful
Test / Create distribution (push) Successful in 1m8s
Test / Sandbox (push) Successful in 2m55s
Test / Hakurei (push) Successful in 5m3s
Test / ShareFS (push) Successful in 5m13s
Test / Hpkg (push) Successful in 5m56s
Test / Hakurei (race detector) (push) Successful in 6m18s
Test / Sandbox (race detector) (push) Successful in 2m37s
Test / Flake checks (push) Successful in 1m43s

This also updates all affected artifacts to use new behaviour.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-03-01 23:54:40 +09:00
parent 9deaf853f0
commit cc60e0d15d
41 changed files with 698 additions and 740 deletions

View File

@@ -13,11 +13,9 @@ func (t Toolchain) newMusl(
)
name := "musl"
attr := MakeAttr{
helper := MakeHelper{
OmitDefaults: true,
SkipCheck: true,
Env: env,
Script: `
mkdir -p /work/system/bin
COMPAT_LINKER_NAME="ld-musl-` + linuxArch() + `.so.1"
@@ -31,20 +29,28 @@ rmdir -v /work/lib
if headers {
name += "-headers"
attr.ScriptInstall = "make DESTDIR=/work install-headers"
attr.Script = ""
helper.Make = []string{
"DESTDIR=/work",
"install-headers",
}
helper.Install = "# headers installed during make"
helper.Script = ""
}
return t.NewViaMake(name, version, t.NewPatchedSource(
return t.NewPackage(name, version, pkg.NewHTTPGetTar(
nil, "https://musl.libc.org/releases/musl-"+version+".tar.gz",
mustDecode(checksum),
pkg.TarGzip,
), &PackageAttr{
NonStage0: extra,
// expected to be writable in copies
"musl", version, pkg.NewHTTPGetTar(
nil, "https://musl.libc.org/releases/musl-"+version+".tar.gz",
mustDecode(checksum),
pkg.TarGzip,
), false,
), &attr, stage0Concat(t, extra,
t.Load(Coreutils),
)...)
Chmod: true,
Env: env,
}, &helper,
Coreutils,
)
}
func init() {
artifactsF[Musl] = func(t Toolchain) pkg.Artifact {