[tip: x86/build] x86/boot/build: Add phony targets in arch/x86/boot/Makefile to PHONY

From: tip-bot2 for Masahiro Yamada
Date: Tue Apr 21 2020 - 14:31:04 EST


The following commit has been merged into the x86/build branch of tip:

Commit-ID: 675a59b7dec6e03c5fb060f18fc25b2e56be3c7a
Gitweb: https://git.kernel.org/tip/675a59b7dec6e03c5fb060f18fc25b2e56be3c7a
Author: Masahiro Yamada <masahiroy@xxxxxxxxxx>
AuthorDate: Sat, 15 Feb 2020 15:38:52 +09:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Tue, 21 Apr 2020 18:30:58 +02:00

x86/boot/build: Add phony targets in arch/x86/boot/Makefile to PHONY

These targets are correctly added to PHONY in arch/x86/Makefile, but
not in arch/x86/boot/Makefile. Thus, with a file 'install' in the top
directory, 'make install' does nothing:

$ touch install
$ make install
make[1]: 'install' is up to date.

Add them to the PHONY targets in the boot Makefile too.

[ bp: Massage. ]

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20200215063852.8298-2-masahiroy@xxxxxxxxxx
---
arch/x86/boot/Makefile | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index f1bf4a7..4c53556 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -128,6 +128,8 @@ quiet_cmd_genimage = GENIMAGE $3
cmd_genimage = sh $(srctree)/$(src)/genimage.sh $2 $3 $(obj)/bzImage \
$(obj)/mtools.conf '$(image_cmdline)' $(FDINITRD)

+PHONY += bzdisk fdimage fdimage144 fdimage288 isoimage bzlilo install
+
# This requires write access to /dev/fd0
bzdisk: $(obj)/bzImage $(obj)/mtools.conf
$(call cmd,genimage,bzdisk,/dev/fd0)