Commit e4c35183 authored by anonym's avatar anonym
Browse files

Revert "Install Linux 4.7."

This reverts commits:

* ab562fd4
* c0bc655c
* 80d0667a

The last minute attempt to include it in Tails 2.6 was a bad (too hasty)
idea, e.g. USB installations don't boot (pre-init results in
"FAT-fs (sdb1): IO charset ascii not found"). Also it seems that the
backport of Linux 4.7 hasn't gone through the proper Debian QA process.
parent 26e04553
......@@ -89,7 +89,7 @@ hw_arch="`dpkg --print-architecture`"
if [ "$hw_arch" = i386 -o "$hw_arch" = amd64 ]; then
$RUN_LB_CONFIG \
--architecture i386 \
--linux-flavours "686-unsigned" \
--linux-flavours "686" \
${@}
# build powerpc images on powerpc64 as well, include only powerpc kernel
elif [ "$hw_arch" = powerpc -o "$hw_arch" = powerpc64 ]; then
......
......@@ -22,7 +22,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
KERNEL_VERSION='4.7.0-0.bpo.1'
KERNEL_VERSION='4.6.0-0.bpo.1'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
......
......@@ -6,7 +6,7 @@ set -e
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'renaming kernels')"
DESCRIPTION="$(Echo 'renaming amd64 kernel')"
HELP=""
USAGE="${PROGRAM}"
......@@ -14,9 +14,7 @@ USAGE="${PROGRAM}"
Read_conffiles config/all config/common config/binary
Set_defaults
Echo_message "Renaming kernels"
Echo_message "Renaming amd64 kernel"
mv binary/live/vmlinuz-*-686 binary/live/vmlinuz
mv binary/live/initrd.img-*-686 binary/live/initrd.img
mv binary/live/vmlinuz-*-amd64 binary/live/vmlinuz2
mv binary/live/initrd.img-*-amd64 binary/live/initrd2.img
......@@ -89,7 +89,7 @@ Package: linux-headers-* linux-headers-*:amd64
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
Package: linux-image-*-unsigned linux-image-*-unsigned:amd64
Package: linux-image-* linux-image-*:amd64
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
......
......@@ -4,6 +4,4 @@ set -e
echo "Installing amd64 Linux kernel"
. /usr/share/amnesia/build/variables
apt-get --yes install "linux-image-${KERNEL_VERSION}-amd64-unsigned:amd64"
apt-get --yes install linux-image-amd64:amd64
......@@ -15,7 +15,7 @@ tails (2.6) unstable; urgency=medium
a serious security regression. (Closes: #11613)
· Add missing icedove-l10n-* packages to our custom APT
repository (Closes: #11550)
- Upgrade to Linux 4.7: (Closes: #10298)
- Upgrade to Linux 4.6: (Closes: #10298)
· Install the 686 kernel flavour instead of the obsolete 586
one.
· APT, dpkg: add amd64 architecture. The amd64 kernel flavour is
......
Subproject commit 7731e69c5a26de9519332be64d973c91a377a582
Subproject commit bd8d020d4b3528e9a900619bc66bf5d6d9a47b6f
......@@ -25,7 +25,7 @@ upgrade as soon as possible.
- Upgrade *Tor Browser* to [6.0.5](https://blog.torproject.org/blog/tor-browser-605-released).
- Upgrade to Linux 4.7. This should improve the support for newer hardware (graphics, Wi-Fi, etc.)
- Upgrade to Linux 4.6. This should improve the support for newer hardware (graphics, Wi-Fi, etc.)
- Upgrade *Icedove* to [45.2.0](https://www.mozilla.org/en-US/thunderbird/45.2.0/releasenotes/).
......
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