kbuild, deb-pkg: fix 'file not found' error when building .deb package for arm

Not all architectures prepend the $(boot) path in $(KBUILD_IMAGE).
Allow for that fact in the builddeb script. Example is arm.

Signed-off-by: Frans Pop <elendil@planet.nl>
Acked-by: maximilian attems <max@stro.at>
Cc: Andres Salomon <dilinger@debian.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index feebd69..4876ff3 100644 (file)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -53,7 +53,10 @@ if [ "$ARCH" = "um" ] ; then
 else 
        cp System.map "$tmpdir/boot/System.map-$version"
        cp .config "$tmpdir/boot/config-$version"
-       cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+       # Not all arches include the boot path in KBUILD_IMAGE
+       if ! cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"; then
+               cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version"
+       fi
 fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then