diff options
| author | Jonathon Fernyhough <jonathon@m2x.dev> | 2022-03-11 01:36:29 +0000 |
|---|---|---|
| committer | Jonathon Fernyhough <jonathon@m2x.dev> | 2022-03-11 01:36:29 +0000 |
| commit | d649df7ca2008b3a6d5c56f2b78bc57ca5828719 (patch) | |
| tree | 80aa2224366b2193b028c6c4918376cfdc80e316 /0001-only-build-the-module-in-dkms.conf.patch | |
| parent | Upstream fixes for 5.16 (diff) | |
| download | zfs-dkms-d649df7ca2008b3a6d5c56f2b78bc57ca5828719.tar.xz | |
Upstream 2.1.3
Diffstat (limited to '0001-only-build-the-module-in-dkms.conf.patch')
| -rw-r--r-- | 0001-only-build-the-module-in-dkms.conf.patch | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/0001-only-build-the-module-in-dkms.conf.patch b/0001-only-build-the-module-in-dkms.conf.patch index 0e162b5..c254dc1 100644 --- a/0001-only-build-the-module-in-dkms.conf.patch +++ b/0001-only-build-the-module-in-dkms.conf.patch @@ -11,32 +11,24 @@ diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf index 88c289383..5a859a0e0 100755 --- a/scripts/dkms.mkconf +++ b/scripts/dkms.mkconf -@@ -25,22 +25,7 @@ PACKAGE_CONFIG="${pkgcfg}" +@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}" 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=\${kernel_source_dir} - --with-linux-obj=\${kernel_source_dir} - --with-spl=\${source_tree}/spl-\${PACKAGE_VERSION} - --with-spl-obj=\${dkms_tree}/spl/\${PACKAGE_VERSION}/\${kernelver}/\${arch} -@@ -78,7 +63,7 @@ POST_BUILD="scripts/dkms.postbuild - BUILD_DEPENDS[0]="spl" ++ --with-linux="\${kernel_source_dir}" + --with-linux-obj="\${kernel_source_dir}" + \$( + [[ -n \"\${ICP_ROOT}\" ]] && \\ +@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild + " AUTOINSTALL="yes" REMAKE_INITRD="no" -MAKE[0]="make" |