summarylogtreecommitdiffstats
path: root/0001-only-build-the-module-in-dkms.conf.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-only-build-the-module-in-dkms.conf.patch')
-rw-r--r--0001-only-build-the-module-in-dkms.conf.patch50
1 files changed, 22 insertions, 28 deletions
diff --git a/0001-only-build-the-module-in-dkms.conf.patch b/0001-only-build-the-module-in-dkms.conf.patch
index 0e162b5db1fa..2efd98c69bd0 100644
--- a/0001-only-build-the-module-in-dkms.conf.patch
+++ b/0001-only-build-the-module-in-dkms.conf.patch
@@ -1,49 +1,43 @@
-From b4a2c0b184c9c9599421b15a430fb88deb5dbd17 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Sun, 28 Oct 2018 15:01:58 -0400
+From 00ff63ea9cdf92539b36bde81b7df3e70eb05480 Mon Sep 17 00:00:00 2001
+From: Yurii Kolesnykov <root@yurikoles.com>
+Date: Fri, 27 May 2022 04:04:02 +0300
Subject: [PATCH] only build the module in dkms.conf
+Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
+Co-authored-by: Eli Schwartz <eschwartz@archlinux.org>
---
- scripts/dkms.mkconf | 19 ++-----------------
- 1 file changed, 2 insertions(+), 17 deletions(-)
+ scripts/dkms.mkconf | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
-index 88c289383..5a859a0e0 100755
+index 0bd3834204..e33f637260 100755
--- a/scripts/dkms.mkconf
+++ b/scripts/dkms.mkconf
-@@ -25,22 +25,7 @@ PACKAGE_CONFIG="${pkgcfg}"
+@@ -28,14 +28,7 @@ NO_WEAK_MODULES="yes"
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-obj="\${kernel_source_dir}"
+ \$(
+ [[ -n \"\${ICP_ROOT}\" ]] && \\
+@@ -68,7 +61,7 @@ POST_BUILD="scripts/dkms.postbuild
+ -t \${dkms_tree}
+ "
AUTOINSTALL="yes"
- REMAKE_INITRD="no"
-MAKE[0]="make"
+MAKE[0]="make -C module/"
STRIP[0]="\$(
[[ -r \${PACKAGE_CONFIG} ]] \\
&& source \${PACKAGE_CONFIG} \\
--
-2.19.1
+2.36.1