summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2020-07-23 15:03:30 +0000
committerintrigeri <intrigeri@boum.org>2020-07-23 15:03:30 +0000
commita26375d960050552c4ebcdc1a762216313e184ff (patch)
tree537af5d43d789f9269cbd1337aeb0162d1ecf07d
parent5b2d3fd0ba41690079f1f0acc965a6087af31a8c (diff)
parent6c07ded0b262e5f6817c6bcaba385641bbcc17d6 (diff)
Merge branch 'stable' into devel
-rw-r--r--config/amnesia2
-rwxr-xr-xconfig/chroot_local-hooks/49-fix-missing-rtw88-firmware36
m---------submodules/tails-workarounds0
3 files changed, 1 insertions, 37 deletions
diff --git a/config/amnesia b/config/amnesia
index 5951d6f..3999f8e 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -23,7 +23,7 @@ AMNESIA_APPEND="live-media=removable nopersistence noprompt timezone=Etc/UTC blo
AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63 --id 42 --verbose"
# Kernel version
-KERNEL_VERSION='5.6.0-2'
+KERNEL_VERSION='5.7.0-1'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/chroot_local-hooks/49-fix-missing-rtw88-firmware b/config/chroot_local-hooks/49-fix-missing-rtw88-firmware
deleted file mode 100755
index 6535d18..0000000
--- a/config/chroot_local-hooks/49-fix-missing-rtw88-firmware
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-echo "Checking for possibly missing rtw88 firmware (#17323)"
-
-# Decide where to copy from, and what:
-WORKAROUNDS_FW_DIR='/tmp/tails-workarounds/linux-firmware'
-DIR='rtw88'
-FILES='rtw8822b_fw.bin rtw8822c_fw.bin'
-
-# Sanity check:
-orig_dir="$WORKAROUNDS_FW_DIR/$DIR"
-if [ ! -d "$orig_dir" ]; then
- echo "=> ERROR: Missing origin directory ($orig_dir)"
- exit 1
-fi
-
-firmware_dir="/lib/firmware/$DIR"
-if [ ! -d "$firmware_dir" ]; then
- echo "=> Missing parent directory ($firmware_dir), creating"
- mkdir -p "$firmware_dir"
-fi
-
-
-for file in $FILES; do
- path="$firmware_dir/$file"
- if [ ! -f "$path" ]; then
- echo "=> Missing firmware ($file), copying"
- cp "$orig_dir/$file" "$path"
- else
- echo "=> ERROR: Firmware for $file found, maybe this hook could be dropped"
- exit 1
- fi
-done
diff --git a/submodules/tails-workarounds b/submodules/tails-workarounds
-Subproject 28bdbfb67243b3ed0ff16c3694d1ac1ee51f564
+Subproject e81b1006a802bca117faa9b295a4b90332c7c47