summarylogtreecommitdiffstats
path: root/dkms.conf
diff options
context:
space:
mode:
authorMichael Lass2018-06-21 21:20:15 +0200
committerMichael Lass2018-06-21 21:27:03 +0200
commitcf1530c05d49fa3bcd6ffefd7c4d6edd7a79db22 (patch)
tree14ef55cf2f7c20c8e1ed8809b3143f53cc83344c /dkms.conf
parentde89fdae6c49919a25d02ca3f989ba4b0945edde (diff)
downloadaur-cf1530c05d49fa3bcd6ffefd7c4d6edd7a79db22.tar.gz
Do not attempt to load MAKEFLAGS from makepkg.conf
The current version of dkms.conf causes issues with pacman's dkms hook if MAKEFLAGS are not set in makepkg.conf. While it would be possible to work around this issue, hijacking makepkg.conf like this is probably not a good idea anyway. If people want to use certain flags for all build processes, they can globally export MAKEFLAGS in their environment. Thanks to seally1186 for tracking down this issue!
Diffstat (limited to 'dkms.conf')
-rw-r--r--dkms.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/dkms.conf b/dkms.conf
index 6cc5af1f677..7329c3e4dea 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -6,7 +6,6 @@ BUILT_MODULE_LOCATION[0]="src/libafs/MODLOAD-$kernelver-SP"
DEST_MODULE_LOCATION[0]="/kernel/fs"
AUTOINSTALL=yes
-export $(grep -m1 '^MAKEFLAGS=' /etc/makepkg.conf)
MAKE[0]="(./configure --prefix=/usr \
--sysconfdir=/etc \
--sbindir=/usr/bin \
@@ -14,5 +13,5 @@ MAKE[0]="(./configure --prefix=/usr \
--disable-fuse-client \
--with-linux-kernel-packaging \
--with-linux-kernel-headers=${kernel_source_dir} \
- && make ${MAKEFLAGS} )"
+ && make)"
CLEAN="[ ! -f Makefile ] || make clean"