From ab4260743ab5dde5e571b54b770c037af1edee70 Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Fri, 23 Mar 2018 21:11:08 +0900 Subject: [PATCH] Bring back armel build by extending the size limit for kernel image Extend the size limit for kernel image, from 2097080 to 2729712. This will break a few qnap devices, but keep other armel devices running. Also revert two commits that disabled armel previously: - [2ed70eb] "Add empty featuresets for armel to help abiupdate script" - [5f62872] "(Temporarily) disable armel kernel image build" (cherry picked from commit b0a94d07b40e6d2086256fb1bfb5b12d8366c056) --- debian/changelog | 12 ++++++++++++ debian/config/armel/defines | 8 ++------ debian/installer/armel/kernel-versions | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4134fd19c..097802955 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +linux (4.15.11-2) UNRELEASED; urgency=medium + + [ Roger Shimizu ] + * Bring back armel build by extending the size limit for kernel image, + from 2097080 to 2729712. This will break a few qnap devices, + but keep other armel devices running. + Also revert two commits that disabled armel previously: + - [2ed70eb] "Add empty featuresets for armel to help abiupdate script" + - [5f62872] "(Temporarily) disable armel kernel image build" + + -- Roger Shimizu Fri, 23 Mar 2018 21:10:34 +0900 + linux (4.15.11-1) unstable; urgency=medium * New upstream stable update: diff --git a/debian/config/armel/defines b/debian/config/armel/defines index 4db6ba133..f40c4038e 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -1,11 +1,7 @@ [base] flavours: - #marvell + marvell kernel-arch: arm -featuresets: -# empty; not building images right now -# cf.: https://lists.debian.org/debian-release/2018/02/msg00239.html -# none [build] image-file: arch/arm/boot/zImage @@ -36,7 +32,7 @@ recommends: u-boot-tools # HP Media Vault mv2120: 2097152 - 8 - 64 = 2097080 # QNAP TS-109/TS-209 & TS-409: 2097152 - 8 - 64 = 2097080 # Buffalo Linkstation LS-WSXL/WXL/WVL (from stock kernel): 2729776 - 64 = 2729712 -check-size: 2097080 +check-size: 2729712 check-size-with-dtb: true ## Maximum uncompressed kernel size for supported devices # Buffalo Linkstation LS-WSXL/WXL/WVL: 7340032 diff --git a/debian/installer/armel/kernel-versions b/debian/installer/armel/kernel-versions index c4ad82d0f..49eb64629 100644 --- a/debian/installer/armel/kernel-versions +++ b/debian/installer/armel/kernel-versions @@ -1,2 +1,2 @@ # arch version flavour installedname suffix build-depends -#armel - marvell - y - +armel - marvell - y -