diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-05-21 15:35:48 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-05-21 15:36:10 +0900 |
| commit | cbf18b302d51c3e667ebe06cfebb14b90ccc93b7 (patch) | |
| tree | c3ad2222ae0e28cf00f11d305a44b8fb900cbf6f /internal/rosa/rosa.go | |
| parent | 1acb5b010507dd2246b77b8c856612b86cb2eda4 (diff) | |
internal/rosa/package: migrate nss
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'internal/rosa/rosa.go')
| -rw-r--r-- | internal/rosa/rosa.go | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/internal/rosa/rosa.go b/internal/rosa/rosa.go index aee3fdb4..e3d8a41a 100644 --- a/internal/rosa/rosa.go +++ b/internal/rosa/rosa.go @@ -302,7 +302,7 @@ mkdir -vp /work/system/bin base := LLVM if flag&TNoToolchain != 0 { - base = musl + base = _musl } support = slices.Concat(extra, t.S.New(t.stage-1).Append([]pkg.Artifact{ @@ -345,7 +345,7 @@ var patch = H("patch") // NewPatchedSource returns [pkg.Artifact] of source with patches applied. If // passthrough is true, source is returned as is for zero length patches. func (t Toolchain) NewPatchedSource( - name, version string, + name string, source pkg.Artifact, passthrough bool, patches ...KV, @@ -363,7 +363,7 @@ func (t Toolchain) NewPatchedSource( } paths[0] = pkg.Path(AbsUsrSrc.Append(name), false, source) - aname := name + "-" + version + "-src" + aname := name + "-src" script := ` cp -r /usr/src/` + name + `/. /work/. chmod -R +w /work && cd /work @@ -491,6 +491,10 @@ func (t Toolchain) NewPackage( if source == nil { panic("source must be non-nil") } + rn := name + if version != Unversioned { + rn = name + "-" + version + } wantsChmod, wantsWrite := helper.wantsChmod(), helper.wantsWrite() extraRes := make([]pkg.Artifact, 0, 1<<3+len(extra)) { @@ -519,7 +523,7 @@ func (t Toolchain) NewPackage( sourceSuffix = ".tar.xz" scriptEarly += ` tar -C /usr/src/ -xf '/usr/src/` + name + `.tar.xz' -mv '/usr/src/` + name + `-` + version + `' '/usr/src/` + name + `' +mv '/usr/src/` + rn + `' '/usr/src/` + name + `' ` } @@ -544,7 +548,7 @@ cd '/usr/src/` + name + `/' } return t.New( - name+"-"+version, + rn, attr.Flag, extraRes, attr.KnownChecksum, @@ -554,7 +558,7 @@ cd '/usr/src/` + name + `/' pkg.Path(AbsUsrSrc.Append( name+sourceSuffix, ), attr.Writable || wantsWrite, t.NewPatchedSource( - name, version, source, !attr.Chmod && !wantsChmod, attr.Patches..., + rn, source, !attr.Chmod && !wantsChmod, attr.Patches..., )), })..., ) |