Commit 521946d5 authored by bertagaz's avatar bertagaz
Browse files

Merge remote-tracking branch 'origin/feature/11818-linux-4.7' into bugfix/11885-linux-4.7

This import the changes brought by #11818 to support linux 4.7. They were
merged into devel, but we need them for 2.7.

Will-fix: #11885
parents 69d81863 60d34f21
......@@ -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
......
......@@ -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,11 +77,11 @@ Package: linux-base
Pin: release o=Debian,n=sid
Pin-Priority: 999
Package: linux-compiler-gcc-4.9-x86
Package: linux-compiler-gcc-*
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: linux-compiler-gcc-4.9-x86:amd64
Package: linux-compiler-gcc-*:amd64
Pin: origin deb.tails.boum.org
Pin-Priority: 999
......@@ -89,7 +89,7 @@ Package: linux-headers-* linux-headers-*:amd64
Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: linux-image-* linux-image-*:amd64
Package: linux-image-*-unsigned linux-image-*-unsigned:amd64
Pin: origin deb.tails.boum.org
Pin-Priority: 999
......
......@@ -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"
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