Commit 0bd7e043 authored by intrigeri's avatar intrigeri

Merge branch 'feature/16072-protected-regular-and-fifo-files+force-all-tests'...

Merge branch 'feature/16072-protected-regular-and-fifo-files+force-all-tests' into bugfix/16352-16184-systemd-v240+force-all-tests
parents 09a0dccb 006e9ef4
......@@ -26,7 +26,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
KERNEL_VERSION='4.18.0-3'
KERNEL_VERSION='4.19.0-1'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
......@@ -27,5 +27,5 @@ done
# Redirect to existing wrapper
sed -i'' --regexp-extended 's,^Exec=pidgin$,Exec=/usr/local/bin/pidgin,' \
"/usr/share/applications/pidgin.desktop"
sed -i'' --regexp-extended 's,^Exec=/usr/bin/totem$,Exec=/usr/local/bin/totem,' \
sed -i'' --regexp-extended 's,^Exec=/usr/bin/totem(\s+.*)?$,Exec=/usr/local/bin/totem,' \
"/usr/share/dbus-1/services/org.gnome.Totem.service"
......@@ -12,8 +12,8 @@ echo "Setting up a build environment for kernel modules"
# install_fake_package()
. /usr/local/lib/tails-shell-library/build.sh
# Install gcc-6 and fake linux-compiler-gcc-7-x86
# (linux-headers-4.14+ depends on it, but Stretch hasn't GCC 7)
# Install gcc-6 and fake linux-compiler-gcc-8-x86
# (linux-headers-4.19+ depends on it, but Stretch hasn't GCC 8)
# XXX:Buster: remove this hack.
ensure_hook_dependency_is_installed gcc-6
NEWEST_INSTALLED_KERNEL_VERSION="$(
......@@ -21,9 +21,9 @@ NEWEST_INSTALLED_KERNEL_VERSION="$(
| sort --version-sort | tail -n1
)"
install_fake_package \
linux-compiler-gcc-7-x86 \
linux-compiler-gcc-8-x86 \
"${NEWEST_INSTALLED_KERNEL_VERSION}~0tails1"
ln -s /usr/bin/gcc-6 /usr/bin/gcc-7
ln -s /usr/bin/gcc-6 /usr/bin/gcc-8
ensure_hook_dependency_is_installed \
build-essential \
......
fs.protected_fifos = 2
fs.protected_regular = 2
Subproject commit a93b3dc526afe614f133b738ddf7fcab06bfd366
Subproject commit dc68432bc8fed5faf20f2a0889739a13110abdc1
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