github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-17 15:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #482 from Amulyam24/fix-ppc64le-rootfs

Browse Source 
osbuilder : ppc64le support for rust agent based rootfs/initrd image
This commit is contained in:
Pradipta Kumar 2020-08-21 12:46:10 +05:30 committed by GitHub
commit bba2773d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/osbuilder/rootfs-builder/rootfs.sh
View File

@ -26,6 +26,7 @@ OSBUILDER_VERSION="unknown"
DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc} DOCKER_RUNTIME=${DOCKER_RUNTIME:-runc}
GO_VERSION="null" GO_VERSION="null"
export GOPATH=${GOPATH:-${HOME}/go} export GOPATH=${GOPATH:-${HOME}/go}
LIBC=${LIBC:-musl}
lib_file="${script_dir}/../scripts/lib.sh" lib_file="${script_dir}/../scripts/lib.sh"
source "$lib_file" source "$lib_file"
@ -574,8 +575,8 @@ EOT
pushd "${agent_dir}" pushd "${agent_dir}"
[ -n "${AGENT_VERSION}" ] && git checkout "${AGENT_VERSION}" && OK "git checkout successful" || info "checkout failed!" [ -n "${AGENT_VERSION}" ] && git checkout "${AGENT_VERSION}" && OK "git checkout successful" || info "checkout failed!"
make clean make clean
make INIT=${AGENT_INIT} make LIBC=${LIBC} INIT=${AGENT_INIT}
make install DESTDIR="${ROOTFS_DIR}" INIT=${AGENT_INIT} SECCOMP=${SECCOMP} make install DESTDIR="${ROOTFS_DIR}" LIBC=${LIBC} INIT=${AGENT_INIT} SECCOMP=${SECCOMP}
popd popd
else else
cp ${AGENT_SOURCE_BIN} ${AGENT_DEST} cp ${AGENT_SOURCE_BIN} ${AGENT_DEST}
@ -631,7 +632,7 @@ See issue: https://github.com/kata-containers/osbuilder/issues/386"
fi fi
fi fi
if [ "${RUST_AGENT}" == "yes" ] && [ "${arch}" == "s390x" -o "${arch}" == "ppc64le" ]; then if [ "${RUST_AGENT}" == "yes" ] && [ "${arch}" == "s390x" ]; then
die "Cannot build rust agent on ppc64le. die "Cannot build rust agent on ppc64le.
musl cannot be built on ppc64le because of long double musl cannot be built on ppc64le because of long double
reprentation is broken. And rust has no musl target on ppc64le. reprentation is broken. And rust has no musl target on ppc64le.