Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion SLES_Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ RUN ls -l /lib/modules

# Build driver --distro ${D_OS}
RUN set -x && \
${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
${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
RUN ls -l ${OFED_SRC_LOCAL_DIR}/RPMS/*/x86_64/
###################################
# Stage: Install precompiled driver
Expand Down
1 change: 1 addition & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ function build_driver_from_src() {
package_type="rpm"
append_driver_build_flags="$append_driver_build_flags --disable-kmp"
append_driver_build_flags="$append_driver_build_flags --kernel-sources /lib/modules/${FULL_KVER}/build"
append_driver_build_flags="$append_driver_build_flags --without-xpmem --without-xpmem-modules"
fi

timestamp_print "Starting driver build"
Expand Down
8 changes: 7 additions & 1 deletion entrypoint/internal/driver/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,13 @@ func (d *driverMgr) getBuildFlagsForOS(osType, kernelVersion string) []string {
case constants.OSTypeUbuntu:
return []string{"--disable-kmp", "--without-dkms"}
case constants.OSTypeSLES:
return []string{"--disable-kmp", "--without-dkms", "--kernel-sources", "/lib/modules/" + kernelVersion + "/build"}
return []string{
"--disable-kmp",
"--without-dkms",
"--kernel-sources", "/lib/modules/" + kernelVersion + "/build",
"--without-xpmem",
"--without-xpmem-modules",
}
case constants.OSTypeRedHat:
return []string{"--disable-kmp", "--without-dkms"}
default:
Expand Down
7 changes: 4 additions & 3 deletions entrypoint/internal/driver/driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1001,9 +1001,10 @@ var _ = Describe("Driver", func() {
"--without-depcheck", "--kernel", "5.4.0-42-default", "--kernel-only", "--build-only",
"--with-mlnx-tools", "--without-knem", "--without-iser",
"--without-isert", "--without-srp", "--without-kernel-mft",
"--without-mlnx-rdma-rxe", "--disable-kmp", "--without-dkms", "--kernel-sources",
"/lib/modules/5.4.0-42-default/build", "--without-mlnx-nfsrdma",
"--without-mlnx-nvme").Return("", "", nil)
"--without-mlnx-rdma-rxe",
"--disable-kmp", "--without-dkms", "--kernel-sources",
"/lib/modules/5.4.0-42-default/build", "--without-xpmem", "--without-xpmem-modules",
"--without-mlnx-nfsrdma", "--without-mlnx-nvme").Return("", "", nil)

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