Skip to content

Guard unzboot copy by arch in ocp_dtk_entrypoint, amd64 doesn't have the binary #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lukiod wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Guard unzboot copy by arch in ocp_dtk_entrypoint, amd64 doesn't have the binary #986

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions rhel10/ocp_dtk_entrypoint
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down