internal/rosa: export source kind
All checks were successful
Test / Create distribution (push) Successful in 1m2s
Test / Sandbox (push) Successful in 3m3s
Test / ShareFS (push) Successful in 4m53s
Test / Hakurei (push) Successful in 5m30s
Test / Sandbox (race detector) (push) Successful in 5m28s
Test / Hakurei (race detector) (push) Successful in 7m57s
Test / Flake checks (push) Successful in 1m22s
All checks were successful
Test / Create distribution (push) Successful in 1m2s
Test / Sandbox (push) Successful in 3m3s
Test / ShareFS (push) Successful in 4m53s
Test / Hakurei (push) Successful in 5m30s
Test / Sandbox (race detector) (push) Successful in 5m28s
Test / Hakurei (race detector) (push) Successful in 7m57s
Test / Flake checks (push) Successful in 1m22s
This is set for an exported field, so export the constants as well. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -635,7 +635,7 @@ func (t Toolchain) newFindutils() (pkg.Artifact, string) {
|
||||
nil, "https://ftpmirror.gnu.org/gnu/findutils/findutils-"+version+".tar.xz",
|
||||
mustDecode(checksum),
|
||||
), &PackageAttr{
|
||||
SourceKind: sourceTarXZ,
|
||||
SourceKind: SourceKindTarXZ,
|
||||
ScriptEarly: `
|
||||
echo '#!/bin/sh' > gnulib-tests/test-c32ispunct.sh
|
||||
echo 'int main(){return 0;}' > tests/xargs/test-sigusr.c
|
||||
|
||||
@@ -18,7 +18,7 @@ func (t Toolchain) newGLib() (pkg.Artifact, string) {
|
||||
"/glib-"+version+".tar.xz",
|
||||
mustDecode(checksum),
|
||||
), &PackageAttr{
|
||||
SourceKind: sourceTarXZ,
|
||||
SourceKind: SourceKindTarXZ,
|
||||
|
||||
Paths: []pkg.ExecPath{
|
||||
pkg.Path(fhs.AbsEtc.Append(
|
||||
|
||||
@@ -17,7 +17,7 @@ func (t Toolchain) newLibxml2() (pkg.Artifact, string) {
|
||||
"/libxml2-"+version+".tar.xz",
|
||||
mustDecode(checksum),
|
||||
), &PackageAttr{
|
||||
SourceKind: sourceTarXZ,
|
||||
SourceKind: SourceKindTarXZ,
|
||||
}, (*MakeHelper)(nil),
|
||||
Diffutils,
|
||||
XZ,
|
||||
|
||||
@@ -17,7 +17,7 @@ func (t Toolchain) newLibxslt() (pkg.Artifact, string) {
|
||||
"/libxslt-"+version+".tar.xz",
|
||||
mustDecode(checksum),
|
||||
), &PackageAttr{
|
||||
SourceKind: sourceTarXZ,
|
||||
SourceKind: SourceKindTarXZ,
|
||||
}, &MakeHelper{
|
||||
// python libxml2 cyclic dependency
|
||||
SkipCheck: true,
|
||||
|
||||
@@ -426,8 +426,8 @@ type Helper interface {
|
||||
}
|
||||
|
||||
const (
|
||||
// sourceTarXZ denotes a source tarball to be decompressed using [XZ].
|
||||
sourceTarXZ = 1 + iota
|
||||
// SourceKindTarXZ denotes a source tarball to be decompressed using [XZ].
|
||||
SourceKindTarXZ = 1 + iota
|
||||
)
|
||||
|
||||
// PackageAttr holds build-system-agnostic attributes.
|
||||
@@ -546,7 +546,7 @@ func (t Toolchain) NewPackage(
|
||||
|
||||
var sourceSuffix string
|
||||
switch attr.SourceKind {
|
||||
case sourceTarXZ:
|
||||
case SourceKindTarXZ:
|
||||
sourceSuffix = ".tar.xz"
|
||||
scriptEarly += `
|
||||
tar -C /usr/src/ -xf '/usr/src/` + name + `.tar.xz'
|
||||
|
||||
Reference in New Issue
Block a user