Skip to content

Commit 7f964da

Browse files
committed
drbd,dkms: use $kernel_source_dir
1 parent 7b44dde commit 7f964da

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

misc/dkms.conf

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE_VERSION="#MODULE_VERSION#"
22
PACKAGE_NAME="drbd"
3-
MAKE="make -C src/drbd KDIR=/lib/modules/$kernelver/build"
4-
CLEAN="make -C src/drbd clean KDIR=/lib/modules/$kernelver/build"
3+
MAKE="make -C src/drbd KDIR=$kernel_source_dir"
4+
CLEAN="make -C src/drbd clean KDIR=$kernel_source_dir"
55
AUTOINSTALL="yes"
66

77
BUILT_MODULE_NAME[0]="drbd"
@@ -16,7 +16,7 @@ DEST_MODULE_LOCATION[2]="/kernel/drivers/block/drbd"
1616

1717
IDX=3
1818

19-
if grep -q ^CONFIG_INFINIBAND= /lib/modules/$kernelver/build/.config; then
19+
if grep -q ^CONFIG_INFINIBAND= "$kernel_source_dir/.config"; then
2020
BUILT_MODULE_NAME[$IDX]="drbd_transport_rdma"
2121
BUILT_MODULE_LOCATION[$IDX]="./src/drbd/build-current/"
2222
DEST_MODULE_LOCATION[$IDX]="/kernel/drivers/block/drbd"
@@ -31,7 +31,7 @@ MAKE+=" BUILD_OFED=1"
3131
# See drbd/Kbuild: this is that check for the kernel version, but worse: check for kernel >= 4.17
3232
IFS=".-" read -ra KVER <<< "$kernelver"
3333
if [ "${KVER[0]}" -ge 4 ] && ( [ "${KVER[0]}" -gt 4 ] || [ "${KVER[1]}" -ge 17 ] ) ; then
34-
if grep -q ^CONFIG_TLS= /lib/modules/$kernelver/build/.config && ! grep -q ^CONFIG_NET_HANDSHAKE= /lib/modules/$kernelver/build/.config ; then
34+
if grep -q ^CONFIG_TLS= "$kernel_source_dir/.config" && ! grep -q ^CONFIG_NET_HANDSHAKE= "$kernel_source_dir/.config" ; then
3535
BUILT_MODULE_NAME[$IDX]="handshake"
3636
BUILT_MODULE_LOCATION[$IDX]="./src/drbd/build-current/drbd-kernel-compat/handshake"
3737
DEST_MODULE_LOCATION[$IDX]="/kernel/net/handshake"
@@ -43,14 +43,14 @@ fi
4343
# So we try to find a compiler that matches the version used to build the original kernel.
4444
get_cc_version() {
4545
if [ -n "$1" ]; then
46-
scl run "$1" -- "/lib/modules/$kernelver/build/scripts/cc-version.sh" cc | cut -d' ' -f2
46+
scl run "$1" -- "$kernel_source_dir/scripts/cc-version.sh" cc | cut -d' ' -f2
4747
else
48-
"/lib/modules/$kernelver/build/scripts/cc-version.sh" cc | cut -d' ' -f2
48+
"$kernel_source_dir/scripts/cc-version.sh" cc | cut -d' ' -f2
4949
fi
5050
}
5151

52-
if [ -e "/lib/modules/$kernelver/build/scripts/cc-version.sh" ]; then
53-
KERNEL_GCC_VERSION="$(grep ^CONFIG_GCC_VERSION= "/lib/modules/$kernelver/build/.config" | cut -d= -f2)"
52+
if [ -e "$kernel_source_dir/scripts/cc-version.sh" ]; then
53+
KERNEL_GCC_VERSION="$(grep ^CONFIG_GCC_VERSION= "$kernel_source_dir/.config" | cut -d= -f2)"
5454

5555
if [ "$KERNEL_GCC_VERSION" -gt "$(get_cc_version)" ] && command -v scl >/dev/null; then
5656
for COLLECTION in $(scl list-collections); do

0 commit comments

Comments
 (0)