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

@@ -7,17 +7,16 @@ func (t Toolchain) newSquashfsTools() pkg.Artifact {
version = "4.7.4"
checksum = "pG0E_wkRJFS6bvPYF-hTKZT-cWnvo5BbIzCDZrJZVQDgJOx2Vc3ZfNSEV7Di7cSW"
)
return t.NewViaMake("squashfs-tools", version, t.NewPatchedSource(
"squashfs-tools", version, pkg.NewHTTPGetTar(
nil, "https://github.com/plougher/squashfs-tools/releases/"+
"download/"+version+"/squashfs-tools-"+version+".tar.gz",
mustDecode(checksum),
pkg.TarGzip,
), false,
), &MakeAttr{
Writable: true,
SkipConfigure: true,
InPlace: true,
return t.NewPackage("squashfs-tools", version, pkg.NewHTTPGetTar(
nil, "https://github.com/plougher/squashfs-tools/releases/"+
"download/"+version+"/squashfs-tools-"+version+".tar.gz",
mustDecode(checksum),
pkg.TarGzip,
), &PackageAttr{
// uses source tree as scratch space
Writable: true,
Chmod: true,
EnterSource: true,
Env: []string{
"CONFIG=1",
@@ -27,15 +26,19 @@ func (t Toolchain) newSquashfsTools() pkg.Artifact {
"COMP_DEFAULT=zstd",
"USE_PREBUILT_MANPAGES=y",
},
ScriptEarly: "cd /usr/src/squashfs-tools/squashfs-tools",
SkipCheck: true,
ScriptInstall: "make INSTALL_PREFIX=/work/system install",
},
t.Load(Sed),
}, &MakeHelper{
t.Load(Zstd),
t.Load(Gzip),
t.Load(Zlib),
SkipConfigure: true,
InPlace: true,
SkipCheck: true,
Install: "make INSTALL_PREFIX=/work/system install",
},
Sed,
Zstd,
Gzip,
Zlib,
)
}
func init() { artifactsF[SquashfsTools] = Toolchain.newSquashfsTools }