Message ID | 20200121155439.1061-1-erosca@de.adit-jv.com (mailing list archive) |
---|---|
State | Mainlined |
Commit | d7bbd6c1b01cb5dd13c245d4586a83145c1d5f52 |
Headers | show |
Series | [v2] arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean' | expand |
On Tue, Jan 21, 2020 at 04:54:39PM +0100, Eugeniu Rosca wrote: > From: Dirk Behme <dirk.behme@de.bosch.com> > > 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> > > --- > v2: > - Added 'Fixes:', 'Cc: stable' and 'Reviewed-by' tags > --- > arch/arm64/boot/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, I'll pick this up. Will
Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: 0723c05fb75e ("arm64: enable more compressed Image formats"). The bot has tested the following trees: v5.4.13, v4.19.97, v4.14.166, v4.9.210, v4.4.210. v5.4.13: Build OK! v4.19.97: Build OK! v4.14.166: Build OK! v4.9.210: Build OK! v4.4.210: Failed to apply! Possible dependencies: f8fa70f392fa ("arm64: localise Image objcopy flags") NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch?
Hi Sasha, On Wed, Jan 22, 2020 at 02:26:25AM +0000, Sasha Levin wrote: > Hi, > > [This is an automated email] > > This commit has been processed because it contains a "Fixes:" tag, > fixing commit: 0723c05fb75e ("arm64: enable more compressed Image formats"). > > The bot has tested the following trees: v5.4.13, v4.19.97, v4.14.166, v4.9.210, v4.4.210. > > v5.4.13: Build OK! > v4.19.97: Build OK! > v4.14.166: Build OK! > v4.9.210: Build OK! > v4.4.210: Failed to apply! Possible dependencies: > f8fa70f392fa ("arm64: localise Image objcopy flags") The heuristics of your scripts is correct. Upon picking f8fa70f392fa ("arm64: localise Image objcopy flags") first, the backporting conflict of ("arm64: kbuild: remove compressed images on 'make ARCH=arm64 (dist)clean'") is avoided. > > NOTE: The patch will not be queued to stable trees until it is upstream. > > How should we proceed with this patch? Shared my thoughts above. Any other input needed?
diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index 1f012c506434..cd3414898d10 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -16,7 +16,7 @@ OBJCOPYFLAGS_Image :=-O binary -R .note -R .note.gnu.build-id -R .comment -S -targets := Image Image.gz +targets := Image Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo $(obj)/Image: vmlinux FORCE $(call if_changed,objcopy)