[1/9,3.18-stable] kbuild: mergeconfig: fix "jobserver unavailable" warning

Message ID 20170505115725.1424772-2-arnd@arndb.de
State New
Headers show
Series
  • fixes for all remaining known warnings
Related show

Commit Message

Arnd Bergmann May 5, 2017, 11:57 a.m.
From: Masahiro Yamada <yamada.masahiro@socionext.com>


Commit f36963c9d3f6f415732710da3acdd8608a9fa0e5 upstream.

If "make kvmconfig" is run with "-j" option, a warning message,
"jobserver unavailable: using -j1.  Add `+' to parent make rule.",
is displayed.

  $ make -s defconfig
  *** Default configuration is based on 'x86_64_defconfig'
  #
  # configuration written to .config
  #
  $ make -j8 kvmconfig
  Using ./.config as base
  Merging ./arch/x86/configs/kvm_guest.config
    [ snip ]
  #
  # merged configuration written to ./.config (needs make)
  #
  make[2]: warning: jobserver unavailable: using -j1.  Add `+' to
  parent make rule.
  scripts/kconfig/conf --oldconfig Kconfig
    [ snip ]
  #
  # configuration written to .config
  #

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Reviewed-by: Darren Hart <dvhart@linux.intel.com>

Signed-off-by: Michal Marek <mmarek@suse.cz>

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 scripts/kconfig/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Greg Kroah-Hartman May 5, 2017, 5:14 p.m. | #1
On Fri, May 05, 2017 at 01:57:17PM +0200, Arnd Bergmann wrote:
> From: Masahiro Yamada <yamada.masahiro@socionext.com>

> 

> Commit f36963c9d3f6f415732710da3acdd8608a9fa0e5 upstream.


Wrong commit id :(
Greg Kroah-Hartman May 5, 2017, 5:46 p.m. | #2
On Fri, May 05, 2017 at 10:14:32AM -0700, Greg KH wrote:
> On Fri, May 05, 2017 at 01:57:17PM +0200, Arnd Bergmann wrote:

> > From: Masahiro Yamada <yamada.masahiro@socionext.com>

> > 

> > Commit f36963c9d3f6f415732710da3acdd8608a9fa0e5 upstream.

> 

> Wrong commit id :(


It's de4619937229378e81f95e99c9866acc8e207d34, I'll fix this...

Patch

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 9645c0739386..fc34f46cb025 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -110,7 +110,7 @@  define mergeconfig
 $(if $(wildcard $(objtree)/.config),, $(error You need an existing .config for this target))
 $(if $(call configfiles,$(1)),, $(error No configuration exists for this target on this architecture))
 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m -O $(objtree) $(objtree)/.config $(call configfiles,$(1))
-$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
++$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig
 endef
 
 PHONY += kvmconfig