diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-09-29 21:10:11 -0400 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-14 09:19:02 -0500 |
| commit | 8a16a070abaa61e95354755a320ca37cee544209 (patch) | |
| tree | 00d3e90ac0c1b580456debf872acdc6a99f1317f /scripts | |
| parent | af60e207087975d069858741c44ed4f450330ac4 (diff) | |
kbuild: rpm-pkg: do not force -jN in submake
The spec file always passes %{?_smp_mflags}, but we have two
problems here.
[1] "make -jN rpm-pkg" emits the following warning message:
make[2]: warning: -jN forced in submake: disabling jobserver mode.
[2] We can not specify the number of jobs that run in parallel.
Whether we give -jN or not from the top Makefile, the spec file
always passes ${?_smp_mflags} to the build commands.
${?_smp_mflags} will be useful when we run rpmbuild by hand. When we
invoke it from Makefile, -jN is propagated down to submake; it should
not be overridden because we want to respect the number of jobs given
by the user. Set _smp_mflags to empty string in this case.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/package/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 70eea1ed8c9c..9ed96aefc72d 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
| @@ -50,7 +50,8 @@ rpm-pkg rpm: FORCE | |||
| 50 | $(MAKE) clean | 50 | $(MAKE) clean |
| 51 | $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec | 51 | $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec |
| 52 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) | 52 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) |
| 53 | +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz | 53 | +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz \ |
| 54 | --define='_smp_mflags %{nil}' | ||
| 54 | 55 | ||
| 55 | # binrpm-pkg | 56 | # binrpm-pkg |
| 56 | # --------------------------------------------------------------------------- | 57 | # --------------------------------------------------------------------------- |
