summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2020-04-28 15:54:06 +0200
committeranonym <anonym@riseup.net>2020-04-28 15:54:06 +0200
commit18232898cd0bd1427f8cb04510303539e08b502e (patch)
tree30f77c6841df4b810eceef9f8a2156eae1d9d097
parentde8bd015b53bc132c97e10bf55fae201f118d067 (diff)
parent70ff1b0543ab226acb41418b4feeeed10c5e7b7e (diff)
Merge remote-tracking branch 'origin/feature/17610-linux-5.5+force-all-tests' into bugfix/17612-torbrowser-launcher-0.3.2-9+force-all-testsbugfix/17612-torbrowser-launcher-0.3.2-9+force-all-tests
-rw-r--r--config/amnesia2
-rw-r--r--config/chroot_apt/preferences5
2 files changed, 6 insertions, 1 deletions
diff --git a/config/amnesia b/config/amnesia
index f1fa06b..8e47d10 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.4.0-4'
+KERNEL_VERSION='5.5.0-2'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 20f6436..8d74b3b 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -70,6 +70,11 @@ Package: webext-ublock-origin
Pin: release o=Debian,n=sid
Pin-Priority: 999
+Explanation: linux-image-5.5.0-2-amd64 : Breaks: wireless-regdb (< 2019.06.03-1~) and 2016.06.10-1 is stable
+Package: wireless-regdb
+Pin: release o=Debian,n=sid
+Pin-Priority: 999
+
Explanation: weirdness in chroot_apt install-binary
Package: *
Pin: release o=chroot_local-packages