From 7f964dae5ca97da3455064d6d6581329e4afbb85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20Wanzenb=C3=B6ck?= Date: Fri, 6 Dec 2024 10:39:23 +0100 Subject: [PATCH] drbd,dkms: use $kernel_source_dir --- misc/dkms.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/misc/dkms.conf b/misc/dkms.conf index 4887702c3..68d2ed228 100644 --- a/misc/dkms.conf +++ b/misc/dkms.conf @@ -1,7 +1,7 @@ PACKAGE_VERSION="#MODULE_VERSION#" PACKAGE_NAME="drbd" -MAKE="make -C src/drbd KDIR=/lib/modules/$kernelver/build" -CLEAN="make -C src/drbd clean KDIR=/lib/modules/$kernelver/build" +MAKE="make -C src/drbd KDIR=$kernel_source_dir" +CLEAN="make -C src/drbd clean KDIR=$kernel_source_dir" AUTOINSTALL="yes" BUILT_MODULE_NAME[0]="drbd" @@ -16,7 +16,7 @@ DEST_MODULE_LOCATION[2]="/kernel/drivers/block/drbd" IDX=3 -if grep -q ^CONFIG_INFINIBAND= /lib/modules/$kernelver/build/.config; then +if grep -q ^CONFIG_INFINIBAND= "$kernel_source_dir/.config"; then BUILT_MODULE_NAME[$IDX]="drbd_transport_rdma" BUILT_MODULE_LOCATION[$IDX]="./src/drbd/build-current/" DEST_MODULE_LOCATION[$IDX]="/kernel/drivers/block/drbd" @@ -31,7 +31,7 @@ MAKE+=" BUILD_OFED=1" # See drbd/Kbuild: this is that check for the kernel version, but worse: check for kernel >= 4.17 IFS=".-" read -ra KVER <<< "$kernelver" if [ "${KVER[0]}" -ge 4 ] && ( [ "${KVER[0]}" -gt 4 ] || [ "${KVER[1]}" -ge 17 ] ) ; then -if grep -q ^CONFIG_TLS= /lib/modules/$kernelver/build/.config && ! grep -q ^CONFIG_NET_HANDSHAKE= /lib/modules/$kernelver/build/.config ; then +if grep -q ^CONFIG_TLS= "$kernel_source_dir/.config" && ! grep -q ^CONFIG_NET_HANDSHAKE= "$kernel_source_dir/.config" ; then BUILT_MODULE_NAME[$IDX]="handshake" BUILT_MODULE_LOCATION[$IDX]="./src/drbd/build-current/drbd-kernel-compat/handshake" DEST_MODULE_LOCATION[$IDX]="/kernel/net/handshake" @@ -43,14 +43,14 @@ fi # So we try to find a compiler that matches the version used to build the original kernel. get_cc_version() { if [ -n "$1" ]; then - scl run "$1" -- "/lib/modules/$kernelver/build/scripts/cc-version.sh" cc | cut -d' ' -f2 + scl run "$1" -- "$kernel_source_dir/scripts/cc-version.sh" cc | cut -d' ' -f2 else - "/lib/modules/$kernelver/build/scripts/cc-version.sh" cc | cut -d' ' -f2 + "$kernel_source_dir/scripts/cc-version.sh" cc | cut -d' ' -f2 fi } -if [ -e "/lib/modules/$kernelver/build/scripts/cc-version.sh" ]; then - KERNEL_GCC_VERSION="$(grep ^CONFIG_GCC_VERSION= "/lib/modules/$kernelver/build/.config" | cut -d= -f2)" +if [ -e "$kernel_source_dir/scripts/cc-version.sh" ]; then + KERNEL_GCC_VERSION="$(grep ^CONFIG_GCC_VERSION= "$kernel_source_dir/.config" | cut -d= -f2)" if [ "$KERNEL_GCC_VERSION" -gt "$(get_cc_version)" ] && command -v scl >/dev/null; then for COLLECTION in $(scl list-collections); do