diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-01-31 05:09:17 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-01-31 08:55:33 +0900 |
| commit | 8b4576bc5f6eaaf703886629f2dfa12ba38b574c (patch) | |
| tree | f347a2189841297be8c5bc96b02dfc610490b19d /internal/rosa/acl.go | |
| parent | 29ebc52e26811b0a657bd1978b0c02284822462f (diff) | |
internal/rosa: migrate to make helper
This migrates artifacts that the helper cannot produce an identical instance of.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/acl.go')
| -rw-r--r-- | internal/rosa/acl.go | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/internal/rosa/acl.go b/internal/rosa/acl.go index 7369896a..f7eaf1cb 100644 --- a/internal/rosa/acl.go +++ b/internal/rosa/acl.go @@ -7,22 +7,7 @@ func (t Toolchain) newAttr() pkg.Artifact { version = "2.5.2" checksum = "YWEphrz6vg1sUMmHHVr1CRo53pFXRhq_pjN-AlG8UgwZK1y6m7zuDhxqJhD0SV0l" ) - return t.New("attr-"+version, 0, []pkg.Artifact{ - t.Load(Make), - t.Load(Perl), - t.Load(Gawk), - t.Load(Coreutils), - }, nil, nil, ` -ln -s ../../system/bin/perl /usr/bin - -cd "$(mktemp -d)" -/usr/src/attr/configure \ - --prefix=/system \ - --build="${ROSA_TRIPLE}" \ - --enable-static -make "-j$(nproc)" check -make DESTDIR=/work install -`, pkg.Path(AbsUsrSrc.Append("attr"), true, t.NewPatchedSource( + return t.NewViaMake("attr", version, t.NewPatchedSource( "attr", version, pkg.NewHTTPGetTar( nil, "https://download.savannah.nongnu.org/releases/attr/"+ "attr-"+version+".tar.gz", @@ -67,7 +52,16 @@ index 6ce2f9b..e9bde92 100644 $ setfattr -n user. -v value f > setfattr: f: Invalid argument `}, - ))) + ), &MakeAttr{ + ScriptEarly: ` +ln -s ../../system/bin/perl /usr/bin +`, + Configure: [][2]string{ + {"enable-static"}, + }, + }, + t.Load(Perl), + ) } func init() { artifactsF[Attr] = Toolchain.newAttr } @@ -83,8 +77,6 @@ func (t Toolchain) newACL() pkg.Artifact { mustDecode(checksum), pkg.TarGzip, ), &MakeAttr{ - Writable: true, - Configure: [][2]string{ {"enable-static"}, }, |