Skip to content

Commit f963640

Browse files
borneoaIngo Molnar
authored andcommitted
x86/platform: Fix "make O=dir kvmconfig"
Running: make O=dir x86_64_defconfig make O=dir kvmconfig the second command dirties the source tree with file ".config", symlink "source" and objects in folder "scripts". Fixed by using properly prefixed paths in the arch Makefile. Signed-off-by: Antonio Borneo <[email protected]> Acked-by: Borislav Petkov <[email protected]> Cc: Pekka Enberg <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent ab0a935 commit f963640

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ archclean:
250250
PHONY += kvmconfig
251251
kvmconfig:
252252
$(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
253-
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config arch/x86/configs/kvm_guest.config
254-
$(Q)yes "" | $(MAKE) oldconfig
253+
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(srctree)/arch/x86/configs/kvm_guest.config
254+
$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
255255

256256
define archhelp
257257
echo '* bzImage - Compressed kernel image (arch/x86/boot/bzImage)'

0 commit comments

Comments
 (0)