[OS-BUILD PATCHv3 12/24] redhat/Makefile: Move RHJOBS to Makefile.variables
From: Prarit Bhargava <prarit(a)redhat.com>
redhat/Makefile: Move RHJOBS to Makefile.variables
Move RHJOBS to Makefile.variables.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -222,13 +222,15 @@ KABIDW := $(REDHAT)/kabi-dwarf
include Makefile.cross
-RHJOBS?=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \
- if [ -z "$${j}" ]; then \
- echo "1"; \
- else \
- j=$$(echo "$${j}" | tr -d "\-j"); \
- [ -z "$${j}" ] && nproc --all || echo $${j}; \
- fi)
+ifndef RHJOBS
+ RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "\ -j[0-9]*" | xargs ); \
+ if [ -z "$${j}" ]; then \
+ echo "1"; \
+ else \
+ j=$$(echo "$${j}" | tr -d "\-j"); \
+ [ -z "$${j}" ] && nproc --all || echo $${j}; \
+ fi)
+endif
ifndef BUILD_FLAGS
ifeq ($(filter $(MAKECMDGOALS),dist-brew distg-brew),)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -100,8 +100,12 @@ PREBUILD_GIT_ONLY ?=
# This overrides the default git repository for the distg-* targets. See
# the 'make dist-full-help' entry for distg-brew for information on setting
# rhg.url.
-RHGITURL?=$(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
+RHGITURL ?= $(shell $(GIT) config rhg.url || $(GIT) config remote.origin.url)
# This sets the base commit ID for distg-* targets, and must be set on the
# commandline with distg-* targets.
-RHGITCOMMIT?=$(shell $(GIT) log -1 --pretty=format:%H)
+RHGITCOMMIT ?= $(shell $(GIT) log -1 --pretty=format:%H)
+
+# This sets the number of threads that scripts called by Makefile targets can
+# use. By default, this variable is set by the makefile '-j' parameter.
+RHJOBS ?=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1641