| From 94dc28d0eb0869420bd5dd4ab98aa172465535bf Mon Sep 17 00:00:00 2001 |
| From: Vasily Gorbik <gor@linux.ibm.com> |
| Date: Fri, 19 Oct 2018 13:37:46 +0200 |
| Subject: s390/decompressor: add missing FORCE to build targets |
| |
| [ Upstream commit ef5febae1543f35a45f01614123e829d77326d0f ] |
| |
| According to Documentation/kbuild/makefiles.txt all build targets |
| using if_changed should use FORCE as well. Add missing FORCE to make |
| sure vmlinux decompressor targets are rebuild properly when not just |
| immediate prerequisites have changed but also when build command differs. |
| |
| Reviewed-by: Philipp Rudo <prudo@linux.ibm.com> |
| Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> |
| Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/s390/boot/compressed/Makefile | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| diff --git a/arch/s390/boot/compressed/Makefile b/arch/s390/boot/compressed/Makefile |
| index 04609478d18b..b375c6c5ae7b 100644 |
| --- a/arch/s390/boot/compressed/Makefile |
| +++ b/arch/s390/boot/compressed/Makefile |
| @@ -20,7 +20,7 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) |
| OBJECTS := $(addprefix $(obj)/,$(obj-y)) |
| |
| LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup -T |
| -$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS) |
| +$(obj)/vmlinux: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OBJECTS) FORCE |
| $(call if_changed,ld) |
| |
| # extract required uncompressed vmlinux symbols and adjust them to reflect offsets inside vmlinux.bin |
| @@ -51,17 +51,17 @@ suffix-$(CONFIG_KERNEL_LZMA) := .lzma |
| suffix-$(CONFIG_KERNEL_LZO) := .lzo |
| suffix-$(CONFIG_KERNEL_XZ) := .xz |
| |
| -$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) |
| +$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE |
| $(call if_changed,gzip) |
| -$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) |
| +$(obj)/vmlinux.bin.bz2: $(vmlinux.bin.all-y) FORCE |
| $(call if_changed,bzip2) |
| -$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) |
| +$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE |
| $(call if_changed,lz4) |
| -$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) |
| +$(obj)/vmlinux.bin.lzma: $(vmlinux.bin.all-y) FORCE |
| $(call if_changed,lzma) |
| -$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) |
| +$(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE |
| $(call if_changed,lzo) |
| -$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) |
| +$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE |
| $(call if_changed,xzkern) |
| |
| LDFLAGS_piggy.o := -r --format binary --oformat $(LD_BFD) -T |
| -- |
| 2.17.1 |
| |