Skip to content

Commit 5ae6034

Browse files
committed
fix: disable xpmem modules in SLES driver build
Signed-off-by: Dana Halperin <dahalperin@nvidia.com>
1 parent 3fa6463 commit 5ae6034

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

SLES_Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ RUN ls -l /lib/modules
134134

135135
# Build driver --distro ${D_OS}
136136
RUN set -x && \
137-
${OFED_SRC_LOCAL_DIR}/install.pl -vvv --distro ${D_OS} --kernel-sources /lib/modules/${D_KERNEL_VER}/build --without-depcheck --kernel ${D_KERNEL_VER} --kernel-only --build-only --copy-ifnames-udev --with-mlnx-tools --without-knem-modules --without-srp-modules --without-kernel-mft-modules --without-iser-modules --without-isert-modules
137+
${OFED_SRC_LOCAL_DIR}/install.pl -vvv --distro ${D_OS} --kernel-sources /lib/modules/${D_KERNEL_VER}/build --without-depcheck --kernel ${D_KERNEL_VER} --kernel-only --build-only --copy-ifnames-udev --with-mlnx-tools --without-knem-modules --without-srp-modules --without-kernel-mft-modules --without-iser-modules --without-isert-modules --without-xpmem-modules --without-xpmem
138138
RUN ls -l ${OFED_SRC_LOCAL_DIR}/RPMS/*/x86_64/
139139
###################################
140140
# Stage: Install precompiled driver

entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ function build_driver_from_src() {
388388
package_type="rpm"
389389
append_driver_build_flags="$append_driver_build_flags --disable-kmp"
390390
append_driver_build_flags="$append_driver_build_flags --kernel-sources /lib/modules/${FULL_KVER}/build"
391+
append_driver_build_flags="$append_driver_build_flags --without-xpmem --without-xpmem-modules"
391392
fi
392393

393394
timestamp_print "Starting driver build"

entrypoint/internal/driver/driver.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,13 @@ func (d *driverMgr) getBuildFlagsForOS(osType, kernelVersion string) []string {
10361036
case constants.OSTypeUbuntu:
10371037
return []string{"--disable-kmp", "--without-dkms"}
10381038
case constants.OSTypeSLES:
1039-
return []string{"--disable-kmp", "--without-dkms", "--kernel-sources", "/lib/modules/" + kernelVersion + "/build"}
1039+
return []string{
1040+
"--disable-kmp",
1041+
"--without-dkms",
1042+
"--kernel-sources", "/lib/modules/" + kernelVersion + "/build",
1043+
"--without-xpmem",
1044+
"--without-xpmem-modules",
1045+
}
10401046
case constants.OSTypeRedHat:
10411047
return []string{"--disable-kmp", "--without-dkms"}
10421048
default:

entrypoint/internal/driver/driver_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,9 +1001,10 @@ var _ = Describe("Driver", func() {
10011001
"--without-depcheck", "--kernel", "5.4.0-42-default", "--kernel-only", "--build-only",
10021002
"--with-mlnx-tools", "--without-knem", "--without-iser",
10031003
"--without-isert", "--without-srp", "--without-kernel-mft",
1004-
"--without-mlnx-rdma-rxe", "--disable-kmp", "--without-dkms", "--kernel-sources",
1005-
"/lib/modules/5.4.0-42-default/build", "--without-mlnx-nfsrdma",
1006-
"--without-mlnx-nvme").Return("", "", nil)
1004+
"--without-mlnx-rdma-rxe",
1005+
"--disable-kmp", "--without-dkms", "--kernel-sources",
1006+
"/lib/modules/5.4.0-42-default/build", "--without-xpmem", "--without-xpmem-modules",
1007+
"--without-mlnx-nfsrdma", "--without-mlnx-nvme").Return("", "", nil)
10071008

10081009
// Mock copyBuildArtifacts - debug logging and copy
10091010
cmdMock.EXPECT().RunCommand(ctx, "uname", "-m").Return("x86_64", "", nil)

0 commit comments

Comments
 (0)