github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 12:14:48 +00:00
Code Issues Projects Releases Wiki Activity

osbuild: build musl toolchain from source if needed

Browse Source 
Currently, musl toolchain installation on arm64 is just downloading from
a website. It's unsafe in case the website corrupts. So build musl
toolchain from source if it can't be downloaded.

Fixes: #1481
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
This commit is contained in:
Jianyong Wu 2021-03-02 16:28:53 +08:00
parent 6e1ef809e1
commit 2da058ed7b
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ci/install_musl.sh
View File

@ -12,10 +12,11 @@ install_aarch64_musl() {
local musl_tar="${arch}-linux-musl-native.tgz" local musl_tar="${arch}-linux-musl-native.tgz"
local musl_dir="${arch}-linux-musl-native" local musl_dir="${arch}-linux-musl-native"
pushd /tmp pushd /tmp
curl -sLO https://musl.cc/${musl_tar} if curl -sLO --fail https://musl.cc/${musl_tar}; then
tar -zxf ${musl_tar} tar -zxf ${musl_tar}
mkdir -p /usr/local/musl/ mkdir -p /usr/local/musl/
cp -r ${musl_dir}/* /usr/local/musl/ cp -r ${musl_dir}/* /usr/local/musl/
fi
popd popd
fi fi
} }

15
tools/osbuilder/scripts/lib.sh
View File

@ -274,15 +274,24 @@ ENV PATH=\$PATH:\$GOROOT/bin:\$GOPATH/bin
# Rust agent # Rust agent
# rust installer should set path apropiately, just in case # rust installer should set path apropiately, just in case
# install musl for compiling rust-agent # install musl for compiling rust-agent
local musl_source_url="https://git.zv.io/toolchains/musl-cross-make.git"
local musl_source_dir="musl-cross-make"
install_musl= install_musl=
if [ "${muslarch}" == "aarch64" ]; then if [ "${muslarch}" == "aarch64" ]; then
local musl_tar="${muslarch}-linux-musl-native.tgz" local musl_tar="${muslarch}-linux-musl-native.tgz"
local musl_dir="${muslarch}-linux-musl-native" local musl_dir="${muslarch}-linux-musl-native"
local aarch64_musl_target="aarch64-linux-musl"
install_musl=" install_musl="
RUN cd /tmp; \ RUN cd /tmp; \
curl -sLO https://musl.cc/${musl_tar}; tar -zxf ${musl_tar}; \ mkdir -p /usr/local/musl/; \
mkdir -p /usr/local/musl/; \ if curl -sLO --fail https://musl.cc/${musl_tar}; then \
cp -r ${musl_dir}/* /usr/local/musl/ cp -r ${musl_dir}/* /usr/local/musl/; \
else \
git clone ${musl_source_url}; \
TARGET=${aarch64_musl_target} make -j$(nproc) -C ${musl_source_dir} install; \
cp -r ${musl_source_dir}/output/* /usr/local/musl/; \
cp /usr/local/musl/bin/aarch64-linux-musl-g++ /usr/local/musl/bin/g++; \
fi
ENV PATH=\$PATH:/usr/local/musl/bin ENV PATH=\$PATH:/usr/local/musl/bin
RUN ln -sf /usr/local/musl/bin/g++ /usr/bin/g++ RUN ln -sf /usr/local/musl/bin/g++ /usr/bin/g++
" "