diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile index 40bb7f915b..aead4fda48 100644 --- a/src/dragonball/Makefile +++ b/src/dragonball/Makefile @@ -6,7 +6,7 @@ include ../../utils.mk PROJECT_DIRS := $(shell find . -name Cargo.toml -printf '%h\n' | sort -u) -ifeq ($(ARCH), $(filter $(ARCH), s390x ppc64le)) +ifeq ($(ARCH), $(filter $(ARCH), s390x powerpc64le)) default build check test clippy vendor: @echo "$(ARCH) is not support currently" exit 0 @@ -34,7 +34,7 @@ vendor: format: @echo "INFO: rust fmt..." - # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. + # This is kinda dirty step here simply because cargo fmt --all will apply fmt to all dependencies of dragonball which will include /src/libs/protocols with some file generated during compilation time and could not be formatted when you use cargo fmt --all before building the whole project. In order to avoid this problem, we do fmt check in this following way. rustfmt --edition 2018 ./src/dbs_address_space/src/lib.rs ./src/dbs_allocator/src/lib.rs ./src/dbs_arch/src/lib.rs ./src/dbs_boot/src/lib.rs ./src/dbs_device/src/lib.rs ./src/dbs_interrupt/src/lib.rs ./src/dbs_legacy_devices/src/lib.rs ./src/dbs_pci/src/lib.rs ./src/dbs_upcall/src/lib.rs ./src/dbs_utils/src/lib.rs ./src/dbs_virtio_devices/src/lib.rs ./src/lib.rs --check clean: diff --git a/src/libs/kata-sys-util/src/protection.rs b/src/libs/kata-sys-util/src/protection.rs index 74ccd5006e..1c39772a7b 100644 --- a/src/libs/kata-sys-util/src/protection.rs +++ b/src/libs/kata-sys-util/src/protection.rs @@ -14,7 +14,7 @@ use std::path::Path; use std::path::PathBuf; use thiserror::Error; -#[cfg(any(target_arch = "s390x", target_arch = "powerpc64le"))] +#[cfg(any(target_arch = "s390x", target_arch = "powerpc64"))] use nix::unistd::Uid; #[cfg(target_arch = "x86_64")] diff --git a/src/tools/kata-ctl/src/arch/mod.rs b/src/tools/kata-ctl/src/arch/mod.rs index b0010955d6..aa6a527ffc 100644 --- a/src/tools/kata-ctl/src/arch/mod.rs +++ b/src/tools/kata-ctl/src/arch/mod.rs @@ -8,10 +8,10 @@ pub mod aarch64; #[cfg(target_arch = "aarch64")] pub use aarch64 as arch_specific; -#[cfg(target_arch = "powerpc64le")] -pub mod powerpc64le; -#[cfg(target_arch = "powerpc64le")] -pub use powerpc64le as arch_specific; +#[cfg(target_arch = "powerpc64")] +pub mod powerpc64; +#[cfg(target_arch = "powerpc64")] +pub use powerpc64 as arch_specific; #[cfg(target_arch = "s390x")] pub mod s390x; @@ -25,7 +25,7 @@ pub use x86_64 as arch_specific; #[cfg(not(any( target_arch = "aarch64", - target_arch = "powerpc64le", + target_arch = "powerpc64", target_arch = "s390x", target_arch = "x86_64" )))] diff --git a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs b/src/tools/kata-ctl/src/arch/powerpc64/mod.rs similarity index 96% rename from src/tools/kata-ctl/src/arch/powerpc64le/mod.rs rename to src/tools/kata-ctl/src/arch/powerpc64/mod.rs index bf5822c041..f47e436d06 100644 --- a/src/tools/kata-ctl/src/arch/powerpc64le/mod.rs +++ b/src/tools/kata-ctl/src/arch/powerpc64/mod.rs @@ -4,7 +4,7 @@ // use crate::types::*; -#[cfg(target_arch = "powerpc64le")] +#[cfg(target_arch = "powerpc64")] pub use arch_specific::*; mod arch_specific { diff --git a/tools/packaging/static-build/qemu/Dockerfile b/tools/packaging/static-build/qemu/Dockerfile index 7a910958f8..a6d79f77b1 100644 --- a/tools/packaging/static-build/qemu/Dockerfile +++ b/tools/packaging/static-build/qemu/Dockerfile @@ -70,4 +70,3 @@ RUN apt-get update && apt-get upgrade -y && \ GCC_ARCH="${ARCH}" && if [ "${ARCH}" = "ppc64le" ]; then GCC_ARCH="powerpc64le"; fi && \ if [ "${ARCH}" != "$(uname -m)" ]; then apt-get install --no-install-recommends -y gcc-"${GCC_ARCH}"-linux-gnu; fi && \ apt-get clean && rm -rf /var/lib/apt/lists/ - diff --git a/utils.mk b/utils.mk index 1a153e26cc..3b44658d66 100644 --- a/utils.mk +++ b/utils.mk @@ -147,6 +147,7 @@ endif ifeq ($(ARCH), ppc64le) override LIBC = gnu + override ARCH = powerpc64le $(warning "WARNING: powerpc64le-unknown-linux-musl target is unavailable") endif