Skip to content

Commit 30ce434

Browse files
masahir0ysuryasaimadhu
authored andcommitted
x86/boot/build: Make 'make bzlilo' not depend on vmlinux or $(obj)/bzImage
bzlilo is an installation target because it copies files to $(INSTALL_PATH)/, then runs 'lilo'. However, arch/x86/Makefile and arch/x86/boot/Makefile have it depend on vmlinux and $(obj)/bzImage, respectively. 'make bzlilo' may update some build artifacts in the source tree. As commit 19514fc ("arm, kbuild: make "make install" not depend on vmlinux") explained, this should not happen. Make 'bzlilo' not depend on any build artifact. Signed-off-by: Masahiro Yamada <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent e3c7c10 commit 30ce434

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/x86/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ drivers-$(CONFIG_FB) += arch/x86/video/
246246

247247
boot := arch/x86/boot
248248

249-
BOOT_TARGETS = bzlilo bzdisk fdimage fdimage144 fdimage288 isoimage
249+
BOOT_TARGETS = bzdisk fdimage fdimage144 fdimage288 isoimage
250250

251251
PHONY += bzImage $(BOOT_TARGETS)
252252

@@ -267,8 +267,8 @@ endif
267267
$(BOOT_TARGETS): vmlinux
268268
$(Q)$(MAKE) $(build)=$(boot) $@
269269

270-
PHONY += install
271-
install:
270+
PHONY += install bzlilo
271+
install bzlilo:
272272
$(Q)$(MAKE) $(build)=$(boot) $@
273273

274274
PHONY += vdso_install

arch/x86/boot/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ isoimage: $(obj)/bzImage
145145
$(call cmd,genimage,isoimage,$(obj)/image.iso)
146146
@$(kecho) 'Kernel: $(obj)/image.iso is ready'
147147

148-
bzlilo: $(obj)/bzImage
148+
bzlilo:
149149
if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
150150
if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
151151
cat $(obj)/bzImage > $(INSTALL_PATH)/vmlinuz

0 commit comments

Comments
 (0)