diff --git a/rhel10/ocp_dtk_entrypoint b/rhel10/ocp_dtk_entrypoint index 6dc1af0d8..bc515f57c 100755 --- a/rhel10/ocp_dtk_entrypoint +++ b/rhel10/ocp_dtk_entrypoint @@ -39,10 +39,16 @@ nv-ctr-run-with-dtk() { /usr/local/bin/nvidia-driver \ /usr/local/bin/common.sh \ /usr/local/bin/extract-vmlinux \ - /usr/bin/unzboot \ /drivers \ "$DRIVER_TOOLKIT_SHARED_DIR/" + # unzboot is only built/installed on aarch64 (see install.sh); it doesn't + # exist on amd64 images, so only copy it there. + DTK_PREP_ARCH=${TARGETARCH/amd64/x86_64} && DTK_PREP_ARCH=${DTK_PREP_ARCH/arm64/aarch64} + if [[ "$DTK_PREP_ARCH" == "aarch64" ]]; then + cp /usr/bin/unzboot "$DRIVER_TOOLKIT_SHARED_DIR/" + fi + if [[ -f "/usr/local/bin/vgpu-util" ]]; then cp /usr/local/bin/vgpu-util "$DRIVER_TOOLKIT_SHARED_DIR/" fi @@ -172,9 +178,12 @@ dtk-build-driver() { "$DRIVER_TOOLKIT_SHARED_DIR/nvidia-driver" \ "$DRIVER_TOOLKIT_SHARED_DIR/common.sh" \ "$DRIVER_TOOLKIT_SHARED_DIR/extract-vmlinux" \ - "$DRIVER_TOOLKIT_SHARED_DIR/unzboot" \ "${DRIVER_TOOLKIT_SHARED_DIR}/bin" + if [[ "$DRIVER_ARCH" == "aarch64" ]]; then + cp -v "$DRIVER_TOOLKIT_SHARED_DIR/unzboot" "${DRIVER_TOOLKIT_SHARED_DIR}/bin" + fi + if [[ -f "$DRIVER_TOOLKIT_SHARED_DIR/vgpu-util" ]]; then cp -v "$DRIVER_TOOLKIT_SHARED_DIR/vgpu-util" "$DRIVER_TOOLKIT_SHARED_DIR/bin" fi