From 3cf2b0c89f38da48fa42268d3ef0da20e70da974 Mon Sep 17 00:00:00 2001
From: Matthew Wittwer <mwittwer@nvidia.com>
Date: Fri, 13 Feb 2026 21:42:06 +0000
Subject: [PATCH] Update to fix vGPU Manager build for OCP 4.19+ and pciutils
 availability in air-gapped environments

---
 Makefile                              | 3 +++
 vgpu-manager/rhel9/ocp_dtk_entrypoint | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/Makefile b/Makefile
index 5572cf13b..2eb689307 100644
--- a/Makefile
+++ b/Makefile
@@ -176,6 +176,7 @@ $(DRIVER_BUILD_TARGETS):
 				$(CURDIR)/$(SUBDIR)
 
 build-rhcos%: SUBDIR = rhel9
+build-rhel9%: SUBDIR = rhel9
 
 build-rocky9%: SUBDIR = rhel9
 build-rocky9%: DOCKER_BUILD_ARGS = --build-arg BASE_IMAGE=nvcr.io/nvidia/cuda:13.1.1-base-rockylinux9
@@ -249,6 +250,7 @@ build-vgpuguest-%: DRIVER_TAG = $(DRIVER_VERSION:-grid=)
 
 # Source of truth for RHEL and CoreOS compatibility https://access.redhat.com/articles/6907891
 build-vgpuguest-rhcos%: SUBDIR = rhel9
+build-vgpuguest-rhel9%: SUBDIR = rhel9
 
 
 $(VGPU_GUEST_DRIVER_BUILD_TARGETS):
@@ -288,6 +290,7 @@ build-vgpuhost-%: DOCKERFILE = $(CURDIR)/vgpu-manager/$(SUBDIR)/Dockerfile
 
 # Source of truth for RHEL and CoreOS compatibility https://access.redhat.com/articles/6907891
 build-vgpuhost-rhcos%: SUBDIR = rhel9
+build-vgpuhost-rhel9%: SUBDIR = rhel9
 
 $(VGPU_HOST_DRIVER_BUILD_TARGETS):
 	DOCKER_BUILDKIT=1 \
diff --git a/vgpu-manager/rhel9/ocp_dtk_entrypoint b/vgpu-manager/rhel9/ocp_dtk_entrypoint
index 3e3040317..3ae20030f 100755
--- a/vgpu-manager/rhel9/ocp_dtk_entrypoint
+++ b/vgpu-manager/rhel9/ocp_dtk_entrypoint
@@ -32,9 +32,15 @@ nv-ctr-run-with-dtk() {
            /usr/local/bin/ocp_dtk_entrypoint \
            /usr/local/bin/nvidia-driver \
            /usr/sbin/lspci \
+           /usr/sbin/setpci \
            /driver \
            "$DRIVER_TOOLKIT_SHARED_DIR/"
 
+        # Copy pciutils library dependencies for the DTK container
+        # (the DTK image does not have libpci, and dnf fallback fails in air-gapped networks)
+        mkdir -p "$DRIVER_TOOLKIT_SHARED_DIR/lib64"
+        cp /usr/lib64/libpci.so* "$DRIVER_TOOLKIT_SHARED_DIR/lib64/"
+
         env | sed 's/=/="/' | sed 's/$/"/' > "$DRIVER_TOOLKIT_SHARED_DIR/env"
 
         touch "$DRIVER_TOOLKIT_SHARED_DIR/dir_prepared"
@@ -108,9 +114,11 @@ dtk-build-driver() {
     cp -v \
        "$DRIVER_TOOLKIT_SHARED_DIR/nvidia-driver" \
        "$DRIVER_TOOLKIT_SHARED_DIR/lspci" \
+       "$DRIVER_TOOLKIT_SHARED_DIR/setpci" \
        "${DRIVER_TOOLKIT_SHARED_DIR}/bin"
 
     export PATH="${DRIVER_TOOLKIT_SHARED_DIR}/bin:$PATH";
+    export LD_LIBRARY_PATH="${DRIVER_TOOLKIT_SHARED_DIR}/lib64:${LD_LIBRARY_PATH:-}";
 
     # ensure lspci is installed, as 'sriov-manage' script requires it
     if ! $(lspci >/dev/null); then