From: Jeremy Kerr <jk@ozlabs.org>
Date: Sat, 25 Oct 2008 22:02:47 +0000 (-0700)
Subject: scripts/package: don't break if %{_smp_mflags} isn't set
X-Git-Tag: v2.6.28-rc3~34^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=13797b77d419fc1b16eebf2993bf7b5cea65f0bf;p=linux-2.6-omap-h63xx.git

scripts/package: don't break if %{_smp_mflags} isn't set

Currently, if we do a 'make rpm-pkg' without the _smp_mflags rpm macro
defined, the build fails with:

  [snip]
  Executing(%build): /bin/bash -e /var/tmp/rpm-tmp.67959
  + umask 022
  + cd /home/jk/devel/kernel-snapshot/rpm/BUILD
  + cd kernel-2.6.26
  + make clean
  + make '%{_smp_mflags}'
  make[3]: *** No rule to make target `%{_smp_mflags}'.  Stop.
  error: Bad exit status from /var/tmp/rpm-tmp.67959 (%build)

This change uses the 'null if not set' reference to the _smp_mflags
macro instead.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 62c5ffdf2fd..2500886fb90 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -57,7 +57,7 @@ fi
 echo "%build"
 
 if ! $PREBUILT; then
-echo "make clean && make %{_smp_mflags}"
+echo "make clean && make %{?_smp_mflags}"
 echo ""
 fi