Commit 690a2239 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/stable' into bugfix/11578-totem-vs-otr

parents 70d60cc5 7c6c47f4
......@@ -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
......
......@@ -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'
......
......@@ -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
......@@ -77,24 +77,24 @@ Package: linux-base
Pin: release o=Debian,n=sid
Pin-Priority: 999
Package: linux-compiler-gcc-4.9-x86
Pin: version 4.6.4-1~bpo8+1
Package: linux-compiler-gcc-*
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: linux-compiler-gcc-4.9-x86:amd64
Pin: version 4.6.4-1~bpo8+1
Package: linux-compiler-gcc-*:amd64
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: linux-headers-* linux-headers-*:amd64
Pin: release o=Debian,n=jessie-backports
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: linux-image-* linux-image-*:amd64
Pin: release o=Debian,n=jessie-backports
Package: linux-image-*-unsigned linux-image-*-unsigned:amd64
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: linux-kbuild-* linux-source-*
Pin: release o=Debian,n=jessie-backports
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: monkeysphere
......
......@@ -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"
Subproject commit bd8d020d4b3528e9a900619bc66bf5d6d9a47b6f
Subproject commit 7731e69c5a26de9519332be64d973c91a377a582
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