Skip to content

Commit

Permalink
Fix directory detection in dkms.mkconf
Browse files Browse the repository at this point in the history
Fix `zfs-dkms` installation on Debian-derived distributions by
aligning the directory detection logic to #13096.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: szubersk <szuberskidamian@gmail.com>
Closes #11449
Closes #13141
  • Loading branch information
szubersk authored Feb 24, 2022
1 parent 78fad47 commit e25bcf9
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions scripts/dkms.mkconf
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,14 @@ PRE_BUILD="configure
--prefix=/usr
--with-config=kernel
--with-linux=\$(
case \`lsb_release -is\` in
(Debian|Devuan)
if [[ -e \${kernel_source_dir/%build/source} ]]
then
echo \${kernel_source_dir/%build/source}
else
# A kpkg exception for Proxmox 2.0
echo \${kernel_source_dir}
fi
;;
(*)
echo \${kernel_source_dir}
;;
esac
if [ -e "\${kernel_source_dir/%build/source}" ]
then
echo "\${kernel_source_dir/%build/source}"
else
echo "\${kernel_source_dir}"
fi
)
--with-linux-obj=\${kernel_source_dir}
--with-linux-obj="\${kernel_source_dir}"
\$(
[[ -n \"\${ICP_ROOT}\" ]] && \\
{
Expand Down

0 comments on commit e25bcf9

Please sign in to comment.