From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Oct 2010 23:19:38 +0000 (-0700)
Subject: Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek... 
X-Git-Tag: v2.6.37-rc1~49
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=2301b65b86df8b80e6779ce9885ad62a5c4adc38;hp=-c

Merge branch 'packaging' of git://git./linux/kernel/git/mmarek/kbuild-2.6

* 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  scripts/package: don't break if %{_smp_mflags} isn't set
  kbuild, deb-pkg: Check if KBUILD_IMAGE exists before copying it
---

2301b65b86df8b80e6779ce9885ad62a5c4adc38
diff --combined scripts/package/mkspec
index 15440f55aef6,186344266c35..e1c1d5b8ca70
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  #
 -#	Output a simple RPM spec file that uses no fancy features requring
 +#	Output a simple RPM spec file that uses no fancy features requiring
  #	RPM v4. This is intended to work with any RPM distro.
  #
  #	The only gothic bit here is redefining install_post to avoid
@@@ -70,7 -70,7 +70,7 @@@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RP
  echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
  echo "%endif"
  
- echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} KBUILD_SRC= modules_install'
+ echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
  echo "%ifarch ia64"
  echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
  echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"