internal/rosa: key metadata by string

For upcoming azalea integration. The API is quite ugly right now to ease migration.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/internal/rosa/musl.go b/internal/rosa/musl.go
index 43c33d43..165304d0 100644
--- a/internal/rosa/musl.go
+++ b/internal/rosa/musl.go
@@ -2,7 +2,7 @@ package rosa
 
 import "hakurei.app/internal/pkg"
 
-func (t Toolchain) newMusl(headers bool) (pkg.Artifact, string) {
+func (s *S) newMusl(t Toolchain, headers bool) (pkg.Artifact, string) {
 	const (
 		version  = "1.2.6"
 		checksum = "WtWb_OV_XxLDAB5NerOL9loLlHVadV00MmGk65PPBU1evaolagoMHfvpZp_vxEzS"
@@ -14,7 +14,7 @@ func (t Toolchain) newMusl(headers bool) (pkg.Artifact, string) {
 		SkipCheck:    true,
 		Script: `
 mkdir -p /work/system/bin
-COMPAT_LINKER_NAME="ld-musl-` + linuxArch() + `.so.1"
+COMPAT_LINKER_NAME="ld-musl-` + s.linuxArch() + `.so.1"
 ln -vs ../lib/libc.so /work/system/bin/linker
 ln -vs ../lib/libc.so /work/system/bin/ldd
 ln -vs libc.so "/work/system/lib/${COMPAT_LINKER_NAME}"
@@ -34,7 +34,7 @@ rmdir -v /work/lib
 	}
 
 	env := []string{
-		"LDFLAGS=" + earlyLDFLAGS(false),
+		"LDFLAGS=" + s.earlyLDFLAGS(false),
 	}
 	if t.isStage0() {
 		env = append(env,
@@ -44,7 +44,7 @@ rmdir -v /work/lib
 		)
 	}
 
-	return t.NewPackage(name, version, newTar(
+	return s.NewPackage(t, name, version, newTar(
 		"https://musl.libc.org/releases/musl-"+version+".tar.gz",
 		checksum,
 		pkg.TarGzip,
@@ -75,9 +75,9 @@ index 715948f4..c2fece68 100644
 	), version
 }
 func init() {
-	artifactsM[Musl] = Metadata{
-		f: func(t Toolchain) (pkg.Artifact, string) {
-			return t.newMusl(false)
+	native.MustRegister(&Artifact{
+		f: func(t Toolchain, s *S) (pkg.Artifact, string) {
+			return s.newMusl(t, false)
 		},
 
 		Name:        "musl",
@@ -85,14 +85,14 @@ func init() {
 		Website:     "https://musl.libc.org/",
 
 		ID: 11688,
-	}
+	})
 
-	artifactsM[muslHeaders] = Metadata{
-		f: func(t Toolchain) (pkg.Artifact, string) {
-			return t.newMusl(true)
+	native.MustRegister(&Artifact{
+		f: func(t Toolchain, s *S) (pkg.Artifact, string) {
+			return s.newMusl(t, true)
 		},
 
 		Name:        "musl-headers",
 		Description: "system installation of musl headers",
-	}
+	})
 }