Message ID | 1460081770-29437-1-git-send-email-yamada.masahiro@socionext.com |
---|---|
State | Accepted |
Commit | 1c44b28dfe527d70a6451ffb7ee091221be82168 |
Headers | show |
Hi Michal, 2016-04-20 17:47 GMT+09:00 Michal Marek <mmarek@suse.cz>: > On Fri, Apr 08, 2016 at 11:16:10AM +0900, Masahiro Yamada wrote: >> "PHONY += FORCE" is already cared by scripts/Makefile.build, >> which these files are included from. > > arch/ia64/Makefile is in fact included via the main Makefile. But this > one also has the PHONY += FORCE statement. Maybe we should initialize > PHONY with FORCE in Kbuild.include. Nevertheless, this patch is correct. > > Michal Ah, right. If it is not too late and you do not mind, could you rephrase the git-log? Like this? ----------------------->8------------------------------------ "PHONY += FORCE" is already cared by scripts/Makefile.build or the top level Makefile, which these files are included from. -----------------------8<------------------------------------ -- Best Regards Masahiro Yamada
diff --git a/arch/arm/boot/bootp/Makefile b/arch/arm/boot/bootp/Makefile index 52a543b..5e4acd2 100644 --- a/arch/arm/boot/bootp/Makefile +++ b/arch/arm/boot/bootp/Makefile @@ -25,4 +25,4 @@ $(obj)/kernel.o: arch/arm/boot/zImage FORCE $(obj)/initrd.o: $(INITRD) FORCE -PHONY += $(INITRD) FORCE +PHONY += $(INITRD) diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile index 648f1ce..c100d78 100644 --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile @@ -96,7 +96,7 @@ define archhelp endef archprepare: make_nr_irqs_h -PHONY += make_nr_irqs_h FORCE +PHONY += make_nr_irqs_h make_nr_irqs_h: $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h diff --git a/arch/unicore32/boot/Makefile b/arch/unicore32/boot/Makefile index ec7fb70..8288550 100644 --- a/arch/unicore32/boot/Makefile +++ b/arch/unicore32/boot/Makefile @@ -31,7 +31,7 @@ $(obj)/uImage: $(obj)/zImage FORCE $(call if_changed,uimage) @echo ' Image $@ is ready' -PHONY += initrd FORCE +PHONY += initrd initrd: @test "$(INITRD)" != "" || \ (echo You must specify INITRD; exit -1)
"PHONY += FORCE" is already cared by scripts/Makefile.build, which these files are included from. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Please apply the following to avoid conflicts. https://patchwork.kernel.org/patch/8572451/ arch/arm/boot/bootp/Makefile | 2 +- arch/ia64/Makefile | 2 +- arch/unicore32/boot/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- 1.9.1