internal/rosa/make: migrate to helper interface

This also updates all affected artifacts to use new behaviour.

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

1 files changed, 16 insertions, 21 deletions

diff --git a/internal/rosa/procps.go b/internal/rosa/procps.go
index 53f5ccde..51c39501 100644
--- a/internal/rosa/procps.go
+++ b/internal/rosa/procps.go
@@ -7,31 +7,26 @@ func (t Toolchain) newProcps() pkg.Artifact {
 		version  = "4.0.6"
 		checksum = "pl_fZLvDlv6iZTkm8l_tHFpzTDVFGCiSJEs3eu0zAX6u36AV36P_En8K7JPScRWM"
 	)
-	return t.NewViaMake("procps", version, t.NewPatchedSource(
-		"procps", version, pkg.NewHTTPGetTar(
-			nil, "https://gitlab.com/procps-ng/procps/-/archive/"+
-				"v"+version+"/procps-v"+version+".tar.bz2",
-			mustDecode(checksum),
-			pkg.TarBzip2,
-		), false,
-	), &MakeAttr{
-		Writable: true,
-		ScriptEarly: `
-cd /usr/src/procps
-./autogen.sh
-`,
+	return t.NewPackage("procps", version, pkg.NewHTTPGetTar(
+		nil, "https://gitlab.com/procps-ng/procps/-/archive/"+
+			"v"+version+"/procps-v"+version+".tar.bz2",
+		mustDecode(checksum),
+		pkg.TarBzip2,
+	), nil, &MakeHelper{
+		Generate: "./autogen.sh",
 		Configure: [][2]string{
 			{"without-ncurses"},
 		},
 	},
-		t.Load(M4),
-		t.Load(Perl),
-		t.Load(Autoconf),
-		t.Load(Automake),
-		t.Load(Gettext),
-		t.Load(Libtool),
-		t.Load(Gzip),
-		t.Load(PkgConfig),
+		M4,
+		Perl,
+		Autoconf,
+		Automake,
+		Gettext,
+		Libtool,
+
+		Gzip,
+		PkgConfig,
 	)
 }
 func init() { artifactsF[Procps] = Toolchain.newProcps }