summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-09-27 20:03:23 +0200
committeranonym <anonym@riseup.net>2016-09-27 20:03:23 +0200
commit255709db38a6a7254aaaa2e0b015c0633ba577b5 (patch)
tree837ddc503df6babb208c7391fad13228a4efac89
parentdd688d66250493d26a9bf826de0322ec3770e5ec (diff)
parent60d34f2155b65d3a6288235b9db4ef6d7e7340cd (diff)
Merge remote-tracking branch 'origin/feature/11818-linux-4.7' into devel
Fix-committed: #11818
-rwxr-xr-xauto/config2
-rw-r--r--config/amnesia2
-rw-r--r--config/binary_local-hooks/05-rename-kernels (renamed from config/binary_local-hooks/05-rename-amd64-kernel)6
-rw-r--r--config/chroot_apt/preferences2
-rw-r--r--config/chroot_local-hooks/12-linux-amd644
-rw-r--r--config/chroot_local-includes/etc/initramfs-tools/modules1
-rw-r--r--debian/changelog2
m---------submodules/aufs4-standalone0
8 files changed, 12 insertions, 7 deletions
diff --git a/auto/config b/auto/config
index 53abffd..668dd85 100755
--- a/auto/config
+++ b/auto/config
@@ -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" \
+ --linux-flavours "686-unsigned" \
${@}
# build powerpc images on powerpc64 as well, include only powerpc kernel
elif [ "$hw_arch" = powerpc -o "$hw_arch" = powerpc64 ]; then
diff --git a/config/amnesia b/config/amnesia
index 96fb331..e0d285b 100644
--- a/config/amnesia
+++ b/config/amnesia
@@ -22,7 +22,7 @@ AMNESIA_ISOHYBRID_OPTS="-h 255 -s 63"
REQUIRED_SYSLINUX_UTILS_UPSTREAM_VERSION="6.03~pre20"
# Kernel version
-KERNEL_VERSION='4.6.0-0.bpo.1'
+KERNEL_VERSION='4.7.0-0.bpo.1'
KERNEL_SOURCE_VERSION=$(
echo "$KERNEL_VERSION" \
| perl -p -E 's{\A (\d+ [.] \d+) [.] .*}{$1}xms'
diff --git a/config/binary_local-hooks/05-rename-amd64-kernel b/config/binary_local-hooks/05-rename-kernels
index 55eadc2..09f8357 100644
--- a/config/binary_local-hooks/05-rename-amd64-kernel
+++ b/config/binary_local-hooks/05-rename-kernels
@@ -6,7 +6,7 @@ set -e
. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Setting static variables
-DESCRIPTION="$(Echo 'renaming amd64 kernel')"
+DESCRIPTION="$(Echo 'renaming kernels')"
HELP=""
USAGE="${PROGRAM}"
@@ -14,7 +14,9 @@ USAGE="${PROGRAM}"
Read_conffiles config/all config/common config/binary
Set_defaults
-Echo_message "Renaming amd64 kernel"
+Echo_message "Renaming kernels"
+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
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 5d828d7..a19eedb 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -89,7 +89,7 @@ Package: linux-headers-* linux-headers-*:amd64
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
-Package: linux-image-* linux-image-*:amd64
+Package: linux-image-*-unsigned linux-image-*-unsigned:amd64
Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
diff --git a/config/chroot_local-hooks/12-linux-amd64 b/config/chroot_local-hooks/12-linux-amd64
index d80e000..cc7764d 100644
--- a/config/chroot_local-hooks/12-linux-amd64
+++ b/config/chroot_local-hooks/12-linux-amd64
@@ -4,4 +4,6 @@ set -e
echo "Installing amd64 Linux kernel"
-apt-get --yes install linux-image-amd64:amd64
+. /usr/share/amnesia/build/variables
+
+apt-get --yes install "linux-image-${KERNEL_VERSION}-amd64-unsigned:amd64"
diff --git a/config/chroot_local-includes/etc/initramfs-tools/modules b/config/chroot_local-includes/etc/initramfs-tools/modules
new file mode 100644
index 0000000..fe6c605
--- /dev/null
+++ b/config/chroot_local-includes/etc/initramfs-tools/modules
@@ -0,0 +1 @@
+nls_ascii
diff --git a/debian/changelog b/debian/changelog
index 73f1ded..de0f24a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,7 +27,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.6: (Closes: #10298)
+ - Upgrade to Linux 4.7: (Closes: #10298)
· Install the 686 kernel flavour instead of the obsolete 586
one.
· APT, dpkg: add amd64 architecture. The amd64 kernel flavour is
diff --git a/submodules/aufs4-standalone b/submodules/aufs4-standalone
-Subproject bd8d020d4b3528e9a900619bc66bf5d6d9a47b6
+Subproject 7731e69c5a26de9519332be64d973c91a377a58