summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2019-10-24 14:47:02 -0400
committerLaura Abbott <labbott@redhat.com>2019-10-29 15:28:51 -0400
commit8be82a0f1b4e580f0c400e5d489f4f09ff0aded5 (patch)
tree18c73a454f93e7ed84d8ee7ef3de1c7ced09faaf
parent862edd6d9621f3adb30983f2046e24cbdad1eb3b (diff)
downloadkernel-8be82a0f1b4e580f0c400e5d489f4f09ff0aded5.tar.gz
kernel-8be82a0f1b4e580f0c400e5d489f4f09ff0aded5.tar.xz
kernel-8be82a0f1b4e580f0c400e5d489f4f09ff0aded5.zip
Don't put %{?_smp_mflags} in the common make definition
Some of the build targets may be racy and need to be fixed up to build correctly. Until that happens, put %{?_smp_mflags} on individual targets.
-rw-r--r--kernel.spec10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 7fb536986..a3a988c11 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1320,7 +1320,7 @@ cp_vmlinux()
%define build_hostldflags %{?build_ldflags} -Wl,--build-id=uuid
%endif
-%define make make %{?cross_opts} %{?make_opts} %{?_smp_mflags} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}"
+%define make make %{?cross_opts} %{?make_opts} HOSTCFLAGS="%{?build_hostcflags}" HOSTLDFLAGS="%{?build_hostldflags}"
BuildKernel() {
MakeTarget=$1
@@ -1366,7 +1366,7 @@ BuildKernel() {
# and now to start the build process
- %{make} mrproper
+ %{make} %{?_smp_mflags} mrproper
cp configs/$Config .config
%if %{signkernel}%{signmodules}
@@ -1382,9 +1382,9 @@ BuildKernel() {
# This ensures build-ids are unique to allow parallel debuginfo
perl -p -i -e "s/^CONFIG_BUILD_SALT.*/CONFIG_BUILD_SALT=\"%{KVERREL}\"/" .config
- %{make} ARCH=$Arch KCFLAGS="$KCFLAGS" WITH_GCOV="%{?with_gcov}" $MakeTarget %{?sparse_mflags} %{?kernel_mflags}
+ %{make} ARCH=$Arch KCFLAGS="$KCFLAGS" WITH_GCOV="%{?with_gcov}" %{?_smp_mflags} $MakeTarget %{?sparse_mflags} %{?kernel_mflags}
if [ $DoModules -eq 1 ]; then
- %{make} ARCH=$Arch KCFLAGS="$KCFLAGS" WITH_GCOV="%{?with_gcov}" modules %{?sparse_mflags} || exit 1
+ %{make} ARCH=$Arch KCFLAGS="$KCFLAGS" WITH_GCOV="%{?with_gcov}" %{?_smp_mflags} modules %{?sparse_mflags} || exit 1
fi
mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
@@ -1477,7 +1477,7 @@ BuildKernel() {
if [ $DoModules -eq 1 ]; then
# Override $(mod-fw) because we don't want it to install any firmware
# we'll get it from the linux-firmware package and we don't want conflicts
- %{make} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
+ %{make} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT %{?_smp_mflags} modules_install KERNELRELEASE=$KernelVer mod-fw=
fi
%if %{with_gcov}