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
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:
@@ -11,17 +11,17 @@ func (t Toolchain) newUtilLinux() pkg.Artifact {
|
||||
version = "2.41.3"
|
||||
checksum = "gPTd5JJ2ho_Rd0qainuogcLiiWwKSXEZPXN3yCCRl0m0KBgMaqwFuMjYgu9z8zCH"
|
||||
)
|
||||
return t.NewViaMake("util-linux", version, pkg.NewHTTPGetTar(
|
||||
return t.NewPackage("util-linux", version, pkg.NewHTTPGetTar(
|
||||
nil, "https://www.kernel.org/pub/linux/utils/util-linux/"+
|
||||
"v"+strings.Join(strings.SplitN(version, ".", 3)[:2], ".")+
|
||||
"/util-linux-"+version+".tar.gz",
|
||||
mustDecode(checksum),
|
||||
pkg.TarGzip,
|
||||
), &MakeAttr{
|
||||
), &PackageAttr{
|
||||
ScriptEarly: `
|
||||
ln -s ../system/bin/bash /bin/
|
||||
`,
|
||||
|
||||
}, &MakeHelper{
|
||||
Configure: [][2]string{
|
||||
{"disable-use-tty-group"},
|
||||
{"disable-makeinstall-setuid"},
|
||||
@@ -41,9 +41,9 @@ ln -s ../system/bin/bash /bin/
|
||||
// Don't execute on production system!
|
||||
SkipCheck: true,
|
||||
},
|
||||
t.Load(Bash),
|
||||
Bash,
|
||||
|
||||
t.Load(KernelHeaders),
|
||||
KernelHeaders,
|
||||
)
|
||||
}
|
||||
func init() { artifactsF[UtilLinux] = Toolchain.newUtilLinux }
|
||||
|
||||
Reference in New Issue
Block a user