]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Feb 2020 10:37:53 +0000 (10:37 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Feb 2020 10:37:53 +0000 (10:37 +0000)
added patches:
arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch

queue-4.4/arm64-kbuild-remove-compressed-images-on-make-arch-arm64-dist-clean.patch [new file with mode: 0644]
queue-4.4/series

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 (file)
index 0000000..86a8996
--- /dev/null
@@ -0,0 +1,40 @@
+From d7bbd6c1b01cb5dd13c245d4586a83145c1d5f52 Mon Sep 17 00:00:00 2001
+From: Dirk Behme <dirk.behme@de.bosch.com>
+Date: Tue, 21 Jan 2020 16:54:39 +0100
+Subject: arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean'
+
+From: Dirk Behme <dirk.behme@de.bosch.com>
+
+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 <dirk.behme@de.bosch.com>
+Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com>
+Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Signed-off-by: Will Deacon <will@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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)
index 420e527f8b52bd6d7f0fa8907f8561a3be69b6f7..9054b144916c7003f0c860d79dba07a5c5491dcb 100644 (file)
@@ -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