diff options
Diffstat (limited to 'internal/rosa')
| -rw-r--r-- | internal/rosa/ssl.go | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/internal/rosa/ssl.go b/internal/rosa/ssl.go index 7be2bf29..7d53abc4 100644 --- a/internal/rosa/ssl.go +++ b/internal/rosa/ssl.go @@ -13,17 +13,18 @@ func (t Toolchain) newNSS() pkg.Artifact { checksum0 = "25x2uJeQnOHIiq_zj17b4sYqKgeoU8-IsySUptoPcdHZ52PohFZfGuIisBreWzx0" ) return t.New("nss-"+version, 0, []pkg.Artifact{ - t.Load(Make), t.Load(Perl), t.Load(Python), + t.Load(Unzip), + t.Load(Make), + t.Load(Gawk), + t.Load(Coreutils), t.Load(Zlib), t.Load(KernelHeaders), }, nil, nil, ` unzip /usr/src/nspr.zip -d /usr/src mv '/usr/src/nspr-NSPR_`+version0+`_RTM' /usr/src/nspr - -chmod -R +w /usr/src/nss cd /usr/src/nss make \ @@ -38,11 +39,13 @@ cp -r \ /usr/src/dist/. \ lib/ckfw/builtins/certdata.txt \ /work/system/nss -`, pkg.Path(AbsUsrSrc.Append("nss"), true, pkg.NewHTTPGetTar( - nil, "https://github.com/nss-dev/nss/archive/refs/tags/"+ - "NSS_"+version+"_RTM.tar.gz", - mustDecode(checksum), - pkg.TarGzip, +`, pkg.Path(AbsUsrSrc.Append("nss"), true, t.NewPatchedSource( + "nss", version, pkg.NewHTTPGetTar( + nil, "https://github.com/nss-dev/nss/archive/refs/tags/"+ + "NSS_"+version+"_RTM.tar.gz", + mustDecode(checksum), + pkg.TarGzip, + ), false, )), pkg.Path(AbsUsrSrc.Append("nspr.zip"), false, pkg.NewHTTPGet( nil, "https://hg-edge.mozilla.org/projects/nspr/archive/"+ "NSPR_"+version0+"_RTM.zip", @@ -62,6 +65,7 @@ func init() { artifactsF[buildcatrust] = Toolchain.newBuildCATrust } func (t Toolchain) newNSSCACert() pkg.Artifact { return t.New("nss-cacert", 0, []pkg.Artifact{ + t.Load(Bash), t.Load(Python), t.Load(NSS), |