diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 16:19:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 16:19:38 -0700 |
| commit | 2301b65b86df8b80e6779ce9885ad62a5c4adc38 (patch) | |
| tree | d61f1b25629e08ee40d1ddec629d7caa67eb7c44 /scripts | |
| parent | e596c79050eafea89cf9fe26b7a807643a2a9904 (diff) | |
| parent | c2d5a7300da667d090c8fe79f05404c9fb205b12 (diff) | |
| download | linux-3.10-2301b65b86df8b80e6779ce9885ad62a5c4adc38.tar.gz linux-3.10-2301b65b86df8b80e6779ce9885ad62a5c4adc38.tar.bz2 linux-3.10-2301b65b86df8b80e6779ce9885ad62a5c4adc38.zip | |
Merge branch 'packaging' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/package/builddeb | 4 | ||||
| -rwxr-xr-x | scripts/package/mkspec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 5f1e2fc7f17..49b74e1ee12 100644 --- 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 15440f55aef..e1c1d5b8ca7 100755 --- 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/" |