From: Greg Kroah-Hartman Date: Mon, 3 Feb 2020 10:37:53 +0000 (+0000) Subject: 4.4-stable patches X-Git-Tag: v5.5.2~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=064471ee00821a01d6df362ac51e1ed2035bf72f;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch --- diff --git a/queue-4.4/arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch b/queue-4.4/arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch new file mode 100644 index 00000000000..86a8996f3ee --- /dev/null +++ b/queue-4.4/arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch @@ -0,0 +1,40 @@ +From d7bbd6c1b01cb5dd13c245d4586a83145c1d5f52 Mon Sep 17 00:00:00 2001 +From: Dirk Behme +Date: Tue, 21 Jan 2020 16:54:39 +0100 +Subject: arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' + +From: Dirk Behme + +commit d7bbd6c1b01cb5dd13c245d4586a83145c1d5f52 upstream. + +Since v4.3-rc1 commit 0723c05fb75e44 ("arm64: enable more compressed +Image formats"), it is possible to build Image.{bz2,lz4,lzma,lzo} +AArch64 images. However, the commit missed adding support for removing +those images on 'make ARCH=arm64 (dist)clean'. + +Fix this by adding them to the target list. +Make sure to match the order of the recipes in the makefile. + +Cc: stable@vger.kernel.org # v4.3+ +Fixes: 0723c05fb75e44 ("arm64: enable more compressed Image formats") +Signed-off-by: Dirk Behme +Signed-off-by: Eugeniu Rosca +Reviewed-by: Masahiro Yamada +Signed-off-by: Will Deacon +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/Makefile ++++ b/arch/arm64/boot/Makefile +@@ -14,7 +14,7 @@ + # Based on the ia64 boot/Makefile. + # + +-targets := Image Image.gz ++targets := Image Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo + + $(obj)/Image: vmlinux FORCE + $(call if_changed,objcopy) diff --git a/queue-4.4/series b/queue-4.4/series index 420e527f8b5..9054b144916 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -22,3 +22,4 @@ net_sched-ematch-reject-invalid-tcf_em_simple.patch crypto-af_alg-use-bh_lock_sock-in-sk_destruct.patch vfs-fix-do_last-regression.patch crypto-pcrypt-fix-user-after-free-on-module-unload.patch +arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch