summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Pop <elendil@planet.nl>2009-04-23 01:09:04 +0200
committerSam Ravnborg <sam@ravnborg.org>2009-06-09 22:37:36 +0200
commita89b433bddea41a743d7937c87be5290ef4f1057 (patch)
tree0ed3e5ac2c0ee8f59d122b32e11f95cc07e8274b
parent3e2ab2563a599c3d3fd03952c056af09fc03b74a (diff)
downloadlinux-3.10-a89b433bddea41a743d7937c87be5290ef4f1057.tar.gz
linux-3.10-a89b433bddea41a743d7937c87be5290ef4f1057.tar.bz2
linux-3.10-a89b433bddea41a743d7937c87be5290ef4f1057.zip
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>
-rw-r--r--scripts/package/builddeb5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index feebd69c2ee..4876ff3154a 100644
--- 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