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/libxml2.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'internal/rosa/libxml2.go') diff --git a/internal/rosa/libxml2.go b/internal/rosa/libxml2.go index 058977e5..8f0a140b 100644 --- a/internal/rosa/libxml2.go +++ b/internal/rosa/libxml2.go @@ -11,21 +11,16 @@ func (t Toolchain) newLibxml2() pkg.Artifact { version = "2.15.1" checksum = "pYzAR3cNrEHezhEMirgiq7jbboLzwMj5GD7SQp0jhSIMdgoU4G9oU9Gxun3zzUIU" ) - return t.NewViaMake("libxml2", version, pkg.NewHTTPGet( + return t.NewPackage("libxml2", version, pkg.NewHTTPGet( nil, "https://download.gnome.org/sources/libxml2/"+ strings.Join(strings.Split(version, ".")[:2], ".")+ "/libxml2-"+version+".tar.xz", mustDecode(checksum), - ), &MakeAttr{ - ScriptEarly: ` -cd /usr/src/ -tar xf libxml2.tar.xz -mv libxml2-` + version + ` libxml2 -`, - SourceSuffix: ".tar.xz", - }, - t.Load(Diffutils), - t.Load(XZ), + ), &PackageAttr{ + SourceKind: sourceTarXZ, + }, (*MakeHelper)(nil), + Diffutils, + XZ, ) } func init() { artifactsF[Libxml2] = Toolchain.newLibxml2 } -- cgit v1.3.1