diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2008-10-26 00:02:47 +0200 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2008-10-29 22:02:08 +0100 |
commit | 13797b77d419fc1b16eebf2993bf7b5cea65f0bf (patch) | |
tree | 3a5271babc0dfe561cd5e1589e8fd32b60d41fff /scripts | |
parent | kbuild: setlocalversion: dont include svn change count (diff) | |
download | linux-13797b77d419fc1b16eebf2993bf7b5cea65f0bf.tar.xz linux-13797b77d419fc1b16eebf2993bf7b5cea65f0bf.zip |
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-x | scripts/package/mkspec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 62c5ffdf2fdf..2500886fb90a 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 |