summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2008-10-25 15:02:47 -0700
committerSam Ravnborg <sam@ravnborg.org>2008-10-29 22:02:08 +0100
commit13797b77d419fc1b16eebf2993bf7b5cea65f0bf (patch)
tree3a5271babc0dfe561cd5e1589e8fd32b60d41fff /scripts
parente3da2fb712bb75b6035ba0743f3256df1de30bce (diff)
downloadop-kernel-dev-13797b77d419fc1b16eebf2993bf7b5cea65f0bf.zip
op-kernel-dev-13797b77d419fc1b16eebf2993bf7b5cea65f0bf.tar.gz
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/package/mkspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 62c5ffd..2500886 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
OpenPOWER on IntegriCloud