Skip to content

Commit 5dff575

Browse files
committed
ci: Update dist-various-1 to ubuntu:22.04
1 parent 35b87d0 commit 5dff575

File tree

1 file changed

+6
-8
lines changed
  • src/ci/docker/host-x86_64/dist-various-1

1 file changed

+6
-8
lines changed

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

3-
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++ \
56
automake \
67
bison \
@@ -73,8 +74,8 @@ RUN env \
7374
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv6 -marm -mfpu=vfp" \
7475
bash musl.sh armhf && \
7576
env \
76-
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a" \
77-
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a" \
77+
CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv7-a -mfpu=vfp3" \
78+
CXX=arm-linux-gnueabihf-g++ CXXFLAGS="-march=armv7-a -mfpu=vfp3" \
7879
bash musl.sh armv7hf && \
7980
env \
8081
CC=mips-openwrt-linux-gcc \
@@ -147,7 +148,7 @@ ENV TARGETS=$TARGETS,armv7a-none-eabi
147148
ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
148149
CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \
149150
CFLAGS_arm_unknown_linux_musleabihf="-march=armv6 -marm -mfpu=vfp" \
150-
CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a" \
151+
CFLAGS_armv7_unknown_linux_musleabihf="-march=armv7-a -mfpu=vfp3" \
151152
CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \
152153
CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \
153154
CC_mips64el_unknown_linux_muslabi64=mips64el-linux-gnuabi64-gcc \
@@ -186,9 +187,6 @@ ENV SCRIPT \
186187
python3 ../x.py --stage 2 test --host='' --target $RUN_MAKE_TARGETS tests/run-make && \
187188
python3 ../x.py dist --host='' --target $TARGETS
188189

189-
COPY scripts/cmake.sh /scripts/
190-
RUN /scripts/cmake.sh
191-
192190
# sccache
193191
COPY scripts/sccache.sh /scripts/
194192
RUN sh /scripts/sccache.sh

0 commit comments

Comments
 (0)