Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 23:19:38 +0000 (16:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 23:19:38 +0000 (16:19 -0700)
* '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

1  2 
scripts/package/mkspec

diff --combined 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/"