Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Ubuntu container version and MUSL-related libs #452

Merged
merged 6 commits into from
Sep 4, 2020
Merged

Bump Ubuntu container version and MUSL-related libs #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26c4875
Bump Ubuntu container version and musl-make libs... hopefully it does…
brainstorm Aug 12, 2020
40e9d51
Bump binutils to verify that 'unable to initialize decompress status …
brainstorm Aug 12, 2020
5f3a430
Bump kversion to buster accordingly
brainstorm Aug 12, 2020
6f43ff2
Fix FPU error from armv7 via same fix as https://github.com/rust-lang…
brainstorm Aug 12, 2020
a9ba0c6
Retrigger build since last one failed on aarch64 with curl/tls timeou…
brainstorm Aug 12, 2020
bcad0a2
Rollback that as it would need other rabbit-hole string of dependenci…
brainstorm Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker/Dockerfile.armv7-unknown-linux-musleabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand All @@ -17,7 +17,8 @@ RUN /musl.sh \
TARGET=arm-linux-musleabihf \
"COMMON_CONFIG += --with-arch=armv7-a \
--with-float=hard \
--with-mode=thumb"
--with-mode=thumb \
--with-fpu=vfp"

# Allows qemu run dynamic linked binaries
RUN ln -sf \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.x86_64-unknown-linux-musl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:20.04

COPY common.sh /
RUN /common.sh
Expand Down
8 changes: 4 additions & 4 deletions docker/linux-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ set -euo pipefail
main() {
# arch in the rust target
local arch="${1}" \
kversion=4.9.0-11
kversion=4.19.0-10

local debsource="deb http://http.debian.net/debian/ stretch main"
debsource="${debsource}\ndeb http://security.debian.org/ stretch/updates main"
local debsource="deb http://http.debian.net/debian/ buster main"
debsource="${debsource}\ndeb http://security.debian.org/ buster/updates main"

local dropbear="dropbear-bin"

Expand Down Expand Up @@ -37,7 +37,7 @@ main() {
kernel="${kversion}-5kc-malta"
;;
powerpc)
# there is no stretch powerpc port, so we use jessie
# there is no buster powerpc port, so we use jessie
# use a more recent kernel from backports
kernel=4.9.0-0.bpo.6-powerpc
debsource="deb http://archive.debian.org/debian jessie main"
Expand Down
7 changes: 4 additions & 3 deletions docker/musl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ hide_output() {
}

main() {
local version=0.9.8
local version=0.9.9

local dependencies=(
ca-certificates
Expand All @@ -44,8 +44,9 @@ main() {
tar --strip-components=1 -xzf "v${version}.tar.gz"

hide_output make install "-j$(nproc)" \
GCC_VER=6.4.0 \
MUSL_VER=1.1.22 \
GCC_VER=9.2.0 \
MUSL_VER=1.2.0 \
BINUTILS_VER=2.33.1 \
DL_CMD='curl --retry 3 -sSfL -C - -o' \
OUTPUT=/usr/local/ \
"${@}"
Expand Down