internal/rosa: make helper

This change only migrates artifacts that remain unchanged under the helper, so this change should not cause any rebuilds.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 14 insertions, 18 deletions

diff --git a/internal/rosa/acl.go b/internal/rosa/acl.go
index ca9b8771..7369896a 100644
--- a/internal/rosa/acl.go
+++ b/internal/rosa/acl.go
@@ -24,8 +24,7 @@ make "-j$(nproc)" check
 make DESTDIR=/work install
 `, pkg.Path(AbsUsrSrc.Append("attr"), true, t.NewPatchedSource(
 		"attr", version, pkg.NewHTTPGetTar(
-			nil,
-			"https://download.savannah.nongnu.org/releases/attr/"+
+			nil, "https://download.savannah.nongnu.org/releases/attr/"+
 				"attr-"+version+".tar.gz",
 			mustDecode(checksum),
 			pkg.TarGzip,
@@ -77,26 +76,23 @@ func (t Toolchain) newACL() pkg.Artifact {
 		version  = "2.3.2"
 		checksum = "-fY5nwH4K8ZHBCRXrzLdguPkqjKI6WIiGu4dBtrZ1o0t6AIU73w8wwJz_UyjIS0P"
 	)
-	return t.New("acl-"+version, 0, []pkg.Artifact{
-		t.Load(Make),
-		t.Load(Gawk),
-		t.Load(Coreutils),
-
-		t.Load(Attr),
-	}, nil, nil, `
-cd "$(mktemp -d)"
-/usr/src/acl/configure \
-	--prefix=/system \
-	--build="${ROSA_TRIPLE}" \
-	--enable-static
-make "-j$(nproc)"
-make DESTDIR=/work install
-`, pkg.Path(AbsUsrSrc.Append("acl"), true, pkg.NewHTTPGetTar(
+	return t.NewViaMake("acl", version, pkg.NewHTTPGetTar(
 		nil,
 		"https://download.savannah.nongnu.org/releases/acl/"+
 			"acl-"+version+".tar.gz",
 		mustDecode(checksum),
 		pkg.TarGzip,
-	)))
+	), &MakeAttr{
+		Writable: true,
+
+		Configure: [][2]string{
+			{"enable-static"},
+		},
+
+		// makes assumptions about uid_map/gid_map
+		SkipCheck: true,
+	},
+		t.Load(Attr),
+	)
 }
 func init() { artifactsF[ACL] = Toolchain.newACL }