Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2301b65b86df8b80e6779ce9885ad62a5c4adc38

Authored by Linus Torvalds
2 parents e596c79050 c2d5a7300d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

Showing 2 changed files Side-by-side Diff

scripts/package/builddeb
Diff comments   View file @ 2301b65
... ... @@ -66,7 +66,9 @@
66 66 cp System.map "$tmpdir/boot/System.map-$version"
67 67 cp .config "$tmpdir/boot/config-$version"
68 68 # Not all arches include the boot path in KBUILD_IMAGE
69   - if ! cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"; then
  69 + if [ -e $KBUILD_IMAGE ]; then
  70 + cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
  71 + else
70 72 cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
71 73 fi
72 74 fi
scripts/package/mkspec
Diff comments   View file @ 2301b65
... ... @@ -70,7 +70,7 @@
70 70 echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
71 71 echo "%endif"
72 72  
73   -echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} KBUILD_SRC= modules_install'
  73 +echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
74 74 echo "%ifarch ia64"
75 75 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
76 76 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"