From 95bf031cb42393790ffe115e7975452420b84169 Mon Sep 17 00:00:00 2001
From: Frans Pop <elendil@planet.nl>
Date: Thu, 23 Apr 2009 01:09:04 +0200
Subject: [PATCH] --- yaml --- r: 149503 b: refs/heads/master c:
 a89b433bddea41a743d7937c87be5290ef4f1057 h: refs/heads/master i:   149501:
 f4a5a4ca8abdaae56110c5e825fc4bd70c2da475   149499:
 5078e733e6ed8935ce41c80eb46f8cbe792850e0   149495:
 e6a45571e3b0a67bd5a39fb61fa5591354e072a3   149487:
 9a291de7cd8f2d06a9c5e43d650c585892878371   149471:
 0da951b82b78418d465459d65c95be12b298ad42   149439:
 39bb2e8ccb716cf03c2906b9a0fd0f95de663a0a   149375:
 93c99c3aa3fdc2bd710c575acf44d4dfdfd6a60e   149247:
 234735ab26cf1f3c80233fc18d062a1c756018da   148991:
 8c49d479d3fcd84b583ded945953a4c852e57206   148479:
 177b4980f77dceeb347ec22ede323533c45145da   147455:
 cada1d8d5107b95ef6be094bd663490652adfd4e v: v3

---
 [refs]                         | 2 +-
 trunk/scripts/package/builddeb | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d193be929741..1b223017ef2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e2ab2563a599c3d3fd03952c056af09fc03b74a
+refs/heads/master: a89b433bddea41a743d7937c87be5290ef4f1057
diff --git a/trunk/scripts/package/builddeb b/trunk/scripts/package/builddeb
index feebd69c2eea..4876ff3154a1 100644
--- a/trunk/scripts/package/builddeb
+++ b/trunk/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