Commit d71bf5fc authored by intrigeri's avatar intrigeri
Browse files

Merge commit '58c096b3' into devel (refs: #15763).

parents a158c465 58c096b3
...@@ -26,7 +26,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose" ...@@ -26,7 +26,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20" REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version # Kernel version
KERNEL_VERSION='4.16.0-2' KERNEL_VERSION='4.17.0-1'
KERNEL_SOURCE_VERSION=$( KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \ echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms' | perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
...@@ -72,7 +72,7 @@ Pin: release o=TorProject,n=tor-nightly-0.3.4.x-stretch ...@@ -72,7 +72,7 @@ Pin: release o=TorProject,n=tor-nightly-0.3.4.x-stretch
Pin-Priority: 999 Pin-Priority: 999
Package: virtualbox* Package: virtualbox*
Pin: origin deb.tails.boum.org Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999 Pin-Priority: 999
Explanation: src:xorg-server Explanation: src:xorg-server
......
...@@ -28,8 +28,9 @@ done ...@@ -28,8 +28,9 @@ done
# which does not match our kernel version, the modules won't be built # which does not match our kernel version, the modules won't be built
# and then we should abort the build. # and then we should abort the build.
for module in vboxguest vboxsf vboxvideo ; do for module in vboxguest vboxsf vboxvideo ; do
for modules_dir in /lib/modules/*/updates ; do for modules_dir in /lib/modules/* ; do
if [ ! -f "${modules_dir}/${module}.ko" ]; then found=$(find "$modules_dir" -name "${module}.ko" | wc -l)
if [ "$found" = 0 ]; then
echo "Can not find ${module} module in '${modules_dir}" >&2 echo "Can not find ${module} module in '${modules_dir}" >&2
exit 1 exit 1
fi fi
......
Subproject commit 8ed212d3987b8aed42d89dd0137bd44bad4a0a6c Subproject commit 01543e47eae7653c7e9a35a7204301f8a0b3ca50
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment