diff options
| author | Michael Lass | 2018-06-21 21:20:15 +0200 |
|---|---|---|
| committer | Michael Lass | 2018-06-21 21:27:03 +0200 |
| commit | cf1530c05d49fa3bcd6ffefd7c4d6edd7a79db22 (patch) | |
| tree | 14ef55cf2f7c20c8e1ed8809b3143f53cc83344c | |
| parent | de89fdae6c49919a25d02ca3f989ba4b0945edde (diff) | |
| download | aur-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!
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | dkms.conf | 3 |
3 files changed, 5 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = openafs-modules-dkms pkgdesc = Kernel module for OpenAFS (dkms) pkgver = 1.8.0 - pkgrel = 1 + pkgrel = 2 url = http://www.openafs.org arch = i686 arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = openafs-modules-dkms source = http://openafs.org/dl/openafs/1.8.0/openafs-1.8.0-src.tar.bz2 source = dkms.conf sha256sums = 63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d - sha256sums = ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf + sha256sums = 05f4218290cbbfa419975ce1dd09e34655a182c4973078578f24a0e468d32275 pkgname = openafs-modules-dkms @@ -7,7 +7,7 @@ pkgname=openafs-modules-dkms _srcname=openafs pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel module for OpenAFS (dkms)" arch=('i686' 'x86_64' 'armv7h') url="http://www.openafs.org" @@ -19,7 +19,7 @@ options=(!emptydirs) source=(http://openafs.org/dl/openafs/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2 dkms.conf) sha256sums=('63fae6b3a4339e4a40945fae1afb9b99a5e7f8e8dbde668938ab8c4ff569fd7d' - 'ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf') + '05f4218290cbbfa419975ce1dd09e34655a182c4973078578f24a0e468d32275') prepare() { cd "${srcdir}/${_srcname}-${pkgver}" diff --git a/dkms.conf b/dkms.conf index 6cc5af1f6772..7329c3e4dea4 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" |