summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2012-04-14 23:39:45 -0500
committerRobby Workman <rworkman@slackbuilds.org>2012-04-14 23:44:39 -0500
commit4b3c0cbf2a3ca121689c182f9ce8cda393df5a22 (patch)
tree357c6146a5604edb3a4615dc8b8fe6f0c2c7e728 /system
parent3db452048c4deb344d2a57d77e113eba8daff1e9 (diff)
downloadslackbuilds-4b3c0cbf2a3ca121689c182f9ce8cda393df5a22.tar.gz
system/kvm-kmod: Fix build with non-running kernel and ...
Remove the depmod.d config file, as it doesn't appear to be needed any more. I'm leaving the bit of code that created it (it's only commented out for now) since I don't know for *sure* that it's not needed any more. What I do know is that IF it IS still needed, the previous file wasn't working anyway since the modules were installed to a new location by upstream, and we (both maintainer and I) missed that fact when updating the build script. Oops :) Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/kvm-kmod/kvm-kmod.SlackBuild20
1 files changed, 12 insertions, 8 deletions
diff --git a/system/kvm-kmod/kvm-kmod.SlackBuild b/system/kvm-kmod/kvm-kmod.SlackBuild
index a50ce31330..0154402de5 100644
--- a/system/kvm-kmod/kvm-kmod.SlackBuild
+++ b/system/kvm-kmod/kvm-kmod.SlackBuild
@@ -75,7 +75,8 @@ sed "s,@KVMGROUP@,$KVMGROUP," $CWD/fixup_udev_rules.diff | patch -p1 || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
- --arch=$ARCH
+ --arch=$ARCH \
+ --kerneldir=/lib/modules/$KERNEL/source
make \
PREFIX=/usr \
@@ -94,15 +95,18 @@ rm -r $PKG/usr/lib${LIBDIRSUFFIX}
# Move /etc/udev to /lib/udev
mv $PKG/etc/udev $PKG/lib
-# Make modprobe prefer the new modules in /lib/modules/$KERNEL/extra/
+# Make modprobe prefer the new modules in /lib/modules/$KERNEL/updates/
# We don't want to install this with a .new suffix, because we want it
# removed with the package.
-mkdir -p $PKG/etc/depmod.d
-cat << EOF > $PKG/etc/depmod.d/kvm-$KERNEL.conf
-override kvm $KERNEL extra
-override kvm-amd $KERNEL extra
-override kvm-intel $KERNEL extra
-EOF
+#mkdir -p $PKG/etc/depmod.d
+#cat << EOF > $PKG/etc/depmod.d/kvm-$KERNEL.conf
+#override kvm $KERNEL updates
+#override kvm-amd $KERNEL updates
+#override kvm-intel $KERNEL updates
+#EOF
+# This isn't needed any more, it appears - seems that anything in the
+# updates/x86/ directory automatically overrides the others. I'm going
+# to leave the above snippet in place at least for now though...
# We don't want the modules.* files in the package
rm -f $PKG/lib/modules/${KERNEL}/modules.*