internal/rosa/ssl: prefix CA paths
All checks were successful
Test / Create distribution (push) Successful in 1m0s
Test / Sandbox (push) Successful in 2m55s
Test / Hakurei (push) Successful in 4m13s
Test / ShareFS (push) Successful in 4m21s
Test / Hpkg (push) Successful in 4m54s
Test / Sandbox (race detector) (push) Successful in 5m13s
Test / Hakurei (race detector) (push) Successful in 6m8s
Test / Flake checks (push) Successful in 1m58s
All checks were successful
Test / Create distribution (push) Successful in 1m0s
Test / Sandbox (push) Successful in 2m55s
Test / Hakurei (push) Successful in 4m13s
Test / ShareFS (push) Successful in 4m21s
Test / Hpkg (push) Successful in 4m54s
Test / Sandbox (race detector) (push) Successful in 5m13s
Test / Hakurei (race detector) (push) Successful in 6m8s
Test / Flake checks (push) Successful in 1m58s
This makes prefixes consistent with everything else since this will end up in the final Rosa OS image. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -17,6 +17,7 @@ func (t Toolchain) newCurl() pkg.Artifact {
|
||||
},
|
||||
Configure: [][2]string{
|
||||
{"with-openssl"},
|
||||
{"with-ca-bundle", "/system/etc/ssl/certs/ca-bundle.crt"},
|
||||
},
|
||||
ScriptConfigured: `
|
||||
make "-j$(nproc)"
|
||||
|
||||
@@ -71,14 +71,14 @@ func (t Toolchain) newNSSCACert() pkg.Artifact {
|
||||
t.Load(NSS),
|
||||
t.Load(buildcatrust),
|
||||
}, nil, nil, `
|
||||
mkdir -p /work/etc/ssl/{certs/unbundled,certs/hashed,trust-source}
|
||||
mkdir -p /work/system/etc/ssl/{certs/unbundled,certs/hashed,trust-source}
|
||||
buildcatrust \
|
||||
--certdata_input /system/nss/certdata.txt \
|
||||
--ca_bundle_output /work/etc/ssl/certs/ca-bundle.crt \
|
||||
--ca_standard_bundle_output /work/etc/ssl/certs/ca-no-trust-rules-bundle.crt \
|
||||
--ca_unpacked_output /work/etc/ssl/certs/unbundled \
|
||||
--ca_hashed_unpacked_output /work/etc/ssl/certs/hashed \
|
||||
--p11kit_output /work/etc/ssl/trust-source/ca-bundle.trust.p11-kit
|
||||
--ca_bundle_output /work/system/etc/ssl/certs/ca-bundle.crt \
|
||||
--ca_standard_bundle_output /work/system/etc/ssl/certs/ca-no-trust-rules-bundle.crt \
|
||||
--ca_unpacked_output /work/system/etc/ssl/certs/unbundled \
|
||||
--ca_hashed_unpacked_output /work/system/etc/ssl/certs/hashed \
|
||||
--p11kit_output /work/system/etc/ssl/trust-source/ca-bundle.trust.p11-kit
|
||||
`)
|
||||
}
|
||||
func init() { artifactsF[NSSCACert] = Toolchain.newNSSCACert }
|
||||
|
||||
Reference in New Issue
Block a user