github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-28 19:54:35 +00:00
Code Issues Projects Releases Wiki Activity

osbuilder: Fix USE_DOCKER on s390x

Browse Source 
- Install the required protobuf-compiler on Ubuntu
- Install correct libc Rust target (glibc on s390x)
- Do not skip Rust installation on s390x

Fixes: #1266

Signed-off-by: Jakob Naucke <jakob.naucke@ibm.com>
This commit is contained in:
Jakob-Naucke 2021-01-14 18:05:53 +01:00 committed by Jakob Naucke
parent d4c506f270
commit 11fe6a3552
No known key found for this signature in database
GPG Key ID: 45FA1C7D310C0EBE
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/osbuilder/rootfs-builder/ubuntu/Dockerfile.in
View File

@ -33,6 +33,7 @@ RUN apt-get update && apt-get --no-install-recommends install -y \
musl \
musl-dev \
musl-tools \
protobuf-compiler \
sed \
systemd \
tar \

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

@ -238,6 +238,7 @@ generate_dockerfile()
local architecture=$(uname -m)
local rustarch=${architecture}
local muslarch=${architecture}
local libc=musl
case "$(uname -m)" in
"ppc64le")
goarch=ppc64le
@ -250,6 +251,7 @@ generate_dockerfile()
;;
"s390x")
goarch=s390x
libc=gnu
;;
*)
@ -311,7 +313,7 @@ RUN . /root/.cargo/env; \
export http_proxy=${http_proxy:-}; \
export https_proxy=${http_proxy:-}; \
cargo install cargo-when; \
rustup target install ${rustarch}-unknown-linux-musl
rustup target install ${rustarch}-unknown-linux-${libc}
RUN ln -sf /usr/bin/g++ /bin/musl-g++
"
# rust agent still need go to build
@ -329,7 +331,7 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
# powerpc have no musl target, don't setup rust enviroment
# since we cannot static link agent. Besides, there is
# also long double representation problem when building musl-libc
if [ "${architecture}" == "ppc64le" ] || [ "${architecture}" == "s390x" ]; then
if [ "${architecture}" == "ppc64le" ]; then
sed \
-e "s|@GO_VERSION@|${GO_VERSION}|g" \
-e "s|@OS_VERSION@|${OS_VERSION:-}|g" \
@ -338,6 +340,17 @@ RUN ln -sf /usr/bin/g++ /bin/musl-g++
-e "s|@INSTALL_RUST@||g" \
-e "s|@SET_PROXY@|${set_proxy:-}|g" \
"${dockerfile_template}" > Dockerfile
# no musl target on s390x, will use GNU
elif [ "${architecture}" == "s390x" ]; then
sed \
-e "s|@GO_VERSION@|${GO_VERSION}|g" \
-e "s|@OS_VERSION@|${OS_VERSION:-}|g" \
-e "s|@INSTALL_CMAKE@|${install_cmake//$'\n'/\\n}|g" \
-e "s|@INSTALL_MUSL@||g" \
-e "s|@INSTALL_GO@|${install_go//$'\n'/\\n}|g" \
-e "s|@INSTALL_RUST@|${install_rust//$'\n'/\\n}|g" \
-e "s|@SET_PROXY@|${set_proxy:-}|g" \
"${dockerfile_template}" > Dockerfile
else
sed \
-e "s|@GO_VERSION@|${GO_VERSION}|g" \