Skip to content

Commit 3337b1a

Browse files
authored
[Rootfs] Update base image, Meson and CompilerSupportLibraries (#3321)
1 parent cebe7ef commit 3337b1a

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

0_RootFS/Rootfs/build_tarballs.jl

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
### Instructions for adding a new version
2+
#
3+
# * Update the bits you want to update, for example:
4+
# * version of the Alpine RootFS: visit https://github.com/alpinelinux/docker-alpine,
5+
# select the branch corresponding to the version of Alpine you want to use, browse to
6+
# the directory `x86_64` and obtain the permanent link of the image (press `Y`)
7+
# * version of Meson
8+
# * version of patchelf
9+
# * version of CSL in `bundled/libs/csl/download_csls.sh`
10+
# * etc...
11+
# * to build and deploy the new image, run
12+
#
13+
# julia build_tarballs.jl --debug --verbose --deploy
14+
115
using Pkg, BinaryBuilder, SHA, Dates
216
if !isdefined(Pkg, :Artifacts)
317
error("This must be run with Julia 1.3+!")
@@ -12,8 +26,8 @@ version = VersionNumber("$(year(today())).$(month(today())).$(day(today()))")
1226
verbose = "--verbose" in ARGS
1327

1428
# We begin by downloading the alpine rootfs and using THAT as a bootstrap rootfs.
15-
rootfs_url = "https://github.com/alpinelinux/docker-alpine/raw/v3.12/x86_64/alpine-minirootfs-3.12.6-x86_64.tar.gz"
16-
rootfs_hash = "21e8b78d55088f4e00c4424510b0ec0d7ad8686887055c944add7596ae27f21a"
29+
rootfs_url = "https://github.com/alpinelinux/docker-alpine/raw/8b8051f1c11daff18ada363488e145af9e201802/x86_64/alpine-minirootfs-3.12.7-x86_64.tar.gz"
30+
rootfs_hash = "3bcc63d60f54d32ae58e6670934bd17aef659c8a17609323a50d3c48d1d8947b"
1731
mkpath(joinpath(@__DIR__, "build"))
1832
mkpath(joinpath(@__DIR__, "products"))
1933
rootfs_targz_path = joinpath(@__DIR__, "build", "rootfs.tar.gz")
@@ -98,8 +112,8 @@ sources = [
98112
GitSource("https://github.com/NixOS/patchelf.git",
99113
"e1e39f3639e39360ceebb2f7ed533cede4623070"),
100114
# We need a very recent version of meson to build gtk stuffs, so let's just grab the latest
101-
ArchiveSource("https://github.com/mesonbuild/meson/releases/download/0.52.0/meson-0.52.0.tar.gz",
102-
"d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32"),
115+
ArchiveSource("https://github.com/mesonbuild/meson/releases/download/0.58.1/meson-0.58.1.tar.gz",
116+
"3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d"),
103117
# We're going to bundle a version of `ldid` into the rootfs for now. When we split this up,
104118
# we'll do this in a nicer way by using JLLs directly, but until then, this is what we've got.
105119
ArchiveSource("https://github.com/JuliaBinaryWrappers/ldid_jll.jl/releases/download/ldid-v2.1.2%2B0/ldid.v2.1.2.x86_64-linux-musl-cxx11.tar.gz",

0_RootFS/Rootfs/bundled/libs/csl/download_csls.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1
33

44
# Download and extract the lib folders from our CompilerSupportLibraries_jll.jl releases
5-
CSL_VERSION="0.3.3+0"
5+
CSL_VERSION="0.5.0+0"
66
for arch in i686 x86_64; do
77
mkdir -p glibc-${arch} musl-${arch}
88
curl -L "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl/releases/download/CompilerSupportLibraries-v${CSL_VERSION}/CompilerSupportLibraries.v${CSL_VERSION%%+*}.${arch}-linux-gnu-libgfortran5.tar.gz" | tar --wildcards --strip-components=2 -zxv -C glibc-${arch} "./lib*/"

0 commit comments

Comments
 (0)