internal/rosa: remove calls to low-level exec helper

This method predates the helper infrastructure, it is awkward to use and difficult to maintain for the replacement bootstrap mechanism. This change prepares for its removal.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
cat
2026-07-27 18:24:38 +09:00
parent bd0cc3656f
commit 95aa7c205c
2 changed files with 22 additions and 10 deletions
+13 -6
View File
@@ -17,13 +17,16 @@ func (t Toolchain) NewViaGit(
url, rev string, url, rev string,
checksum pkg.Checksum, checksum pkg.Checksum,
) pkg.Artifact { ) pkg.Artifact {
return t.New(strings.TrimSuffix( return t.NewPackage(strings.TrimSuffix(
path.Base(url), path.Base(url),
".git", ".git",
)+"-src-"+path.Base(rev), THostNet, t.Append(nil, )+"-src", path.Base(rev), nil, &PackageAttr{
_nssCACert, KnownChecksum: &checksum,
_git,
), &checksum, nil, ` Flag: THostNet,
Paths: []pkg.ExecPath{resolvconf()},
}, &GenericHelper{
Build: `
git \ git \
-c advice.detachedHead=false \ -c advice.detachedHead=false \
clone \ clone \
@@ -34,5 +37,9 @@ git \
` + url + ` \ ` + url + ` \
/work /work
rm -rf /work/.git rm -rf /work/.git
`, resolvconf()) `,
},
_nssCACert,
_git,
)
} }
+7 -2
View File
@@ -363,9 +363,14 @@ function apply {
buf.WriteString("'\n") buf.WriteString("'\n")
} }
} }
return t.New(name+"-src", 0, t.Append(nil,
return t.NewPackage(name+"-src", Unversioned, nil, &PackageAttr{
Paths: paths,
}, &GenericHelper{
Build: buf.String(),
},
_patch, _patch,
), nil, nil, buf.String(), paths...) )
} }
// helperInPlace is a special directory value for omitting the cd statement. // helperInPlace is a special directory value for omitting the cd statement.