summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-10-07 10:24:26 +0000
committerintrigeri <intrigeri@boum.org>2017-10-07 10:24:26 +0000
commitd2cf804d8af2e884d3735eb2d264386e68982bee (patch)
treefedd99d83a230857484ab5db3bae5ecddb3bee6c
parent7086b059c7cec8c42a6d32b1febffaff46f47369 (diff)
parent9c7d5cc2393c81c92cd82e5aa1a81a8fb8775374 (diff)
Merge branch 'feature/14789-linux-4.13' into feature/buster
-rw-r--r--config/amnesia2
-rwxr-xr-xconfig/chroot_local-hooks/50-dkms19
2 files changed, 20 insertions, 1 deletions
diff --git a/config/amnesia b/config/amnesia
index 7ef92b5..f7680e4 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -25,7 +25,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
-KERNEL_VERSION='4.12.0-2'
+KERNEL_VERSION='4.13.0-1'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/chroot_local-hooks/50-dkms b/config/chroot_local-hooks/50-dkms
index 1757e2b..2061aa8 100755
--- a/config/chroot_local-hooks/50-dkms
+++ b/config/chroot_local-hooks/50-dkms
@@ -28,6 +28,25 @@ dkms install \
# clean the build directory
# rm -r /var/lib/dkms/virtualbox-guest/
+# Ensure the modules were actually built and installed: when
+# dkms.conf for a DKMS module includes a BUILD_EXCLUSIVE directive
+# which does not match our kernel version, the modules won't be built
+# and then we should abort the build.
+for modules_dir in /lib/modules/*/kernel/fs/aufs ; do
+ if [ ! -f "${modules_dir}/aufs.ko" ]; then
+ echo "Can not find aufs.ko module in '${modules_dir}" >&2
+ exit 1
+ fi
+done
+for module in vboxguest vboxsf vboxvideo ; do
+ for modules_dir in /lib/modules/*/updates ; do
+ if [ ! -f "${modules_dir}/${module}.ko" ]; then
+ echo "Can not find ${module} module in '${modules_dir}" >&2
+ exit 1
+ fi
+ done
+done
+
# virtualbox-guest-dkms's postrm script deletes any previously
# built binary module; let's delete it before the package gets purged.
rm /var/lib/dpkg/info/aufs-dkms.prerm