github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 11:36:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10381 from GabyCT/topic/archrootfs

Browse Source 
osbuilder: Remove duplicated arch variable definition
This commit is contained in:
GabyCT 2024-10-03 14:48:08 -06:00 committed by GitHub
commit 2d089d9695
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,6 @@ handle_error() {
trap 'handle_error $LINENO' ERR trap 'handle_error $LINENO' ERR
# Default architecture # Default architecture
export ARCH=${ARCH:-$(uname -m)}
if [ "$ARCH" == "ppc64le" ] || [ "$ARCH" == "s390x" ]; then if [ "$ARCH" == "ppc64le" ] || [ "$ARCH" == "s390x" ]; then
LIBC=gnu LIBC=gnu
echo "WARNING: Forcing LIBC=gnu because $ARCH has no musl Rust target" echo "WARNING: Forcing LIBC=gnu because $ARCH has no musl Rust target"
@ -650,7 +649,7 @@ EOF
if [ -z "${AGENT_SOURCE_BIN}" ] && [ -z "${AGENT_TARBALL}" ] ; then if [ -z "${AGENT_SOURCE_BIN}" ] && [ -z "${AGENT_TARBALL}" ] ; then
test -r "${HOME}/.cargo/env" && source "${HOME}/.cargo/env" test -r "${HOME}/.cargo/env" && source "${HOME}/.cargo/env"
# rust agent needs ${arch}-unknown-linux-${LIBC} # rust agent needs ${ARCH}-unknown-linux-${LIBC}
if ! (rustup show | grep -v linux-${LIBC} > /dev/null); then if ! (rustup show | grep -v linux-${LIBC} > /dev/null); then
if [ "$RUST_VERSION" == "null" ]; then if [ "$RUST_VERSION" == "null" ]; then
detect_rust_version || \ detect_rust_version || \
@ -782,7 +781,6 @@ parse_arguments()
shift $(($OPTIND - 1)) shift $(($OPTIND - 1))
distro="$1" distro="$1"
arch=$(uname -m)
} }
detect_host_distro() detect_host_distro()