From cc60e0d15d79916a69c8a1caeb3c4611351bb6c4 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 1 Mar 2026 23:54:40 +0900 Subject: internal/rosa/make: migrate to helper interface This also updates all affected artifacts to use new behaviour. Signed-off-by: Ophestra --- internal/rosa/bzip2.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'internal/rosa/bzip2.go') diff --git a/internal/rosa/bzip2.go b/internal/rosa/bzip2.go index 569d7d8a..e32b3507 100644 --- a/internal/rosa/bzip2.go +++ b/internal/rosa/bzip2.go @@ -7,21 +7,22 @@ func (t Toolchain) newBzip2() pkg.Artifact { version = "1.0.8" checksum = "cTLykcco7boom-s05H1JVsQi1AtChYL84nXkg_92Dm1Xt94Ob_qlMg_-NSguIK-c" ) - return t.NewViaMake("bzip2", version, pkg.NewHTTPGetTar( + return t.NewPackage("bzip2", version, pkg.NewHTTPGetTar( nil, "https://sourceware.org/pub/bzip2/bzip2-"+version+".tar.gz", mustDecode(checksum), pkg.TarGzip, - ), &MakeAttr{ - Writable: true, + ), &PackageAttr{ + Writable: true, + EnterSource: true, + }, &MakeHelper{ + // uses source tree as scratch space SkipConfigure: true, SkipCheck: true, InPlace: true, - - ScriptEarly: "cd /usr/src/bzip2", Make: []string{ "CC=cc", }, - ScriptInstall: "make PREFIX=/work/system install", + Install: "make PREFIX=/work/system install", }) } func init() { artifactsF[Bzip2] = Toolchain.newBzip2 } -- cgit v1.3.1