summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAnisse Astier <anisse@astier.eu>2013-07-03 16:02:05 +0200
committerMichal Marek <mmarek@suse.cz>2013-07-24 15:50:23 +0200
commit9de7017644ceda33bec10b6bd564c2bc8120c3fc (patch)
tree7e058bca199cfc0539b050d64ab8deae0cb979db /scripts
parent810e843746b7297819b0a76b6c105b9bda01fd9c (diff)
downloadlinux-stable-9de7017644ceda33bec10b6bd564c2bc8120c3fc.tar.gz
linux-stable-9de7017644ceda33bec10b6bd564c2bc8120c3fc.tar.bz2
linux-stable-9de7017644ceda33bec10b6bd564c2bc8120c3fc.zip
deb-pkg: fix installed image path on parisc, mips and powerpc
Signed-off-by: Anisse Astier <anisse@astier.eu> Reviewed-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package/builddeb27
1 files changed, 20 insertions, 7 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 541a1cfa9a6b..aebc66e056f4 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -89,6 +89,20 @@ if [ "$ARCH" = "um" ] ; then
packagename=user-mode-linux-$version
fi
+# Not all arches have the same installed path in debian
+# XXX: have each arch Makefile export a variable of the canonical image install
+# path instead
+case $ARCH in
+um)
+ installed_image_path="usr/bin/linux-$version"
+ ;;
+parisc|mips|powerpc)
+ installed_image_path="boot/vmlinux-$version"
+ ;;
+*)
+ installed_image_path="boot/vmlinuz-$version"
+esac
+
BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)"
# Setup the directory structure
@@ -116,16 +130,15 @@ if [ "$ARCH" = "um" ] ; then
cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map"
cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config"
gzip "$tmpdir/usr/share/doc/$packagename/config"
- cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version"
else
cp System.map "$tmpdir/boot/System.map-$version"
cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
- # Not all arches include the boot path in KBUILD_IMAGE
- 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
+# Not all arches include the boot path in KBUILD_IMAGE
+if [ -e $KBUILD_IMAGE ]; then
+ cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
+else
+ cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
fi
if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then