Skip to content

Commit 8a8ff3e

Browse files
committed
Update musl ci jobs
- musl updated to 1.1.19 - linux kernel headers taken from upstream version 4.14.56 instead of the forked ones from sabotage-linux.
1 parent ebe0feb commit 8a8ff3e

File tree

4 files changed

+33
-35
lines changed

4 files changed

+33
-35
lines changed

ci/docker/aarch64-unknown-linux-musl/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@ FROM ubuntu:17.10
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \
5-
gcc-aarch64-linux-gnu qemu-user
6-
RUN curl https://www.musl-libc.org/releases/musl-1.1.16.tar.gz | \
5+
gcc-aarch64-linux-gnu qemu-user xz-utils
6+
RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
77
tar xzf - && \
8-
cd musl-1.1.16 && \
8+
cd musl-1.1.19 && \
99
CC=aarch64-linux-gnu-gcc \
1010
./configure --prefix=/musl-aarch64 --enable-wrapper=yes && \
1111
make install -j4 && \
1212
cd .. && \
13-
rm -rf musl-1.1.16 && \
13+
rm -rf musl-1.1.19
1414
# Install linux kernel headers sanitized for use with musl
15-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
16-
tar xzf - && \
17-
cd kernel-headers-3.12.6-5 && \
18-
make ARCH=arm64 prefix=/musl-aarch64 install -j4 && \
15+
RUN curl -L https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.56.tar.xz | \
16+
tar xJf - && \
17+
cd linux-4.14.56 && \
18+
CC=false make ARCH=arm64 INSTALL_HDR_PATH=/musl-aarch64 headers_install -j4 && \
1919
cd .. && \
20-
rm -rf kernel-headers-3.12.6-5
20+
rm -rf linux-4.14.56
2121

2222
# FIXME: shouldn't need the `-lgcc` here, shouldn't that be in libstd?
2323
ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \

ci/docker/arm-unknown-linux-musleabihf/Dockerfile

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
44
gcc make libc6-dev git curl ca-certificates \
55
gcc-arm-linux-gnueabihf qemu-user
66

7-
RUN curl https://www.musl-libc.org/releases/musl-1.1.16.tar.gz | tar xzf -
8-
WORKDIR /musl-1.1.16
7+
RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | tar xzf -
8+
WORKDIR /musl-1.1.19
99
RUN CC=arm-linux-gnueabihf-gcc \
1010
CFLAGS="-march=armv6 -marm" \
1111
./configure --prefix=/musl-arm --enable-wrapper=yes
1212
RUN make install -j4
13-
1413
# Install linux kernel headers sanitized for use with musl
15-
RUN \
16-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
17-
tar xzf - && \
18-
cd kernel-headers-3.12.6-5 && \
19-
make ARCH=arm prefix=/musl-arm install -j4 && \
14+
RUN curl -L https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.56.tar.xz | \
15+
tar xJf - && \
16+
cd linux-4.14.56 && \
17+
CC=false make ARCH=arm INSTALL_HDR_PATH=/musl-arm headers_install -j4 && \
2018
cd .. && \
21-
rm -rf kernel-headers-3.12.6-5
19+
rm -rf linux-4.14.56
2220
ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
2321
CC_arm_unknown_linux_musleabihf=musl-gcc \
2422
CARGO_TARGET_ARM_UNKNOWN_LINUX_MUSLEABIHF_LINKER=musl-gcc \

ci/docker/i686-unknown-linux-musl/Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ RUN apt-get install -y --no-install-recommends \
1212
# since otherwise the script will fail to find a compiler.
1313
# * We manually unset CROSS_COMPILE when running make; otherwise the makefile
1414
# will call the non-existent binary 'i686-ar'.
15-
RUN curl https://www.musl-libc.org/releases/musl-1.1.15.tar.gz | \
15+
RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
1616
tar xzf - && \
17-
cd musl-1.1.15 && \
17+
cd musl-1.1.19 && \
1818
CC=gcc CFLAGS=-m32 ./configure --prefix=/musl-i686 --disable-shared --target=i686 && \
1919
make CROSS_COMPILE= install -j4 && \
2020
cd .. && \
21-
rm -rf musl-1.1.15 && \
21+
rm -rf musl-1.1.19
2222
# Install linux kernel headers sanitized for use with musl
23-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
24-
tar xzf - && \
25-
cd kernel-headers-3.12.6-5 && \
26-
make ARCH=i386 prefix=/musl-i686 install -j4 && \
23+
RUN curl -L https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.56.tar.xz | \
24+
tar xJf - && \
25+
cd linux-4.14.56 && \
26+
CC=false make ARCH=i386 INSTALL_HDR_PATH=/musl-i686 headers_install -j4 && \
2727
cd .. && \
28-
rm -rf kernel-headers-3.12.6-5
28+
rm -rf linux-4.14.56
2929
ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
3030
CC_i686_unknown_linux_musl=musl-gcc

ci/docker/x86_64-unknown-linux-musl/Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ FROM ubuntu:17.10
22

33
RUN apt-get update
44
RUN apt-get install -y --no-install-recommends \
5-
gcc make libc6-dev git curl ca-certificates
6-
RUN curl https://www.musl-libc.org/releases/musl-1.1.15.tar.gz | \
5+
gcc make libc6-dev git curl ca-certificates linux-libc-dev xz-utils
6+
RUN curl https://www.musl-libc.org/releases/musl-1.1.19.tar.gz | \
77
tar xzf - && \
8-
cd musl-1.1.15 && \
8+
cd musl-1.1.19 && \
99
./configure --prefix=/musl-x86_64 && \
1010
make install -j4 && \
1111
cd .. && \
12-
rm -rf musl-1.1.15 && \
12+
rm -rf musl-1.1.19
1313
# Install linux kernel headers sanitized for use with musl
14-
curl -L https://github.com/sabotage-linux/kernel-headers/archive/v3.12.6-5.tar.gz | \
15-
tar xzf - && \
16-
cd kernel-headers-3.12.6-5 && \
17-
make ARCH=x86_64 prefix=/musl-x86_64 install -j4 && \
14+
RUN curl -L https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.56.tar.xz | \
15+
tar xJf - && \
16+
cd linux-4.14.56 && \
17+
CC=false make V=1 ARCH=x86_64 INSTALL_HDR_PATH=/musl-x86_64 headers_install -j4 && \
1818
cd .. && \
19-
rm -rf kernel-headers-3.12.6-5
19+
rm -rf linux-4.14.56
2020
ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin

0 commit comments

Comments
 (0)