Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

* '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

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5f1e2fc..49b74e1 100644 (file)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -66,7 +66,9 @@ else
        cp System.map "$tmpdir/boot/System.map-$version"
        cp .config "$tmpdir/boot/config-$version"
        # Not all arches include the boot path in KBUILD_IMAGE
-       if ! cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"; then
+       if [ -e $KBUILD_IMAGE ]; then
+               cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+       else
                cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
        fi
 fi

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 15440f5..e1c1d5b 100755 (executable)
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -70,7 +70,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
 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/"