Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anisse Astier and committed by
Michal Marek
9de70176 810e8437

+20 -7
+20 -7
scripts/package/builddeb
··· 89 89 packagename=user-mode-linux-$version 90 90 fi 91 91 92 + # Not all arches have the same installed path in debian 93 + # XXX: have each arch Makefile export a variable of the canonical image install 94 + # path instead 95 + case $ARCH in 96 + um) 97 + installed_image_path="usr/bin/linux-$version" 98 + ;; 99 + parisc|mips|powerpc) 100 + installed_image_path="boot/vmlinux-$version" 101 + ;; 102 + *) 103 + installed_image_path="boot/vmlinuz-$version" 104 + esac 105 + 92 106 BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" 93 107 94 108 # Setup the directory structure ··· 130 116 cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" 131 117 cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" 132 118 gzip "$tmpdir/usr/share/doc/$packagename/config" 133 - cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" 134 119 else 135 120 cp System.map "$tmpdir/boot/System.map-$version" 136 121 cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" 137 - # Not all arches include the boot path in KBUILD_IMAGE 138 - if [ -e $KBUILD_IMAGE ]; then 139 - cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" 140 - else 141 - cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" 142 - fi 122 + fi 123 + # Not all arches include the boot path in KBUILD_IMAGE 124 + if [ -e $KBUILD_IMAGE ]; then 125 + cp $KBUILD_IMAGE "$tmpdir/$installed_image_path" 126 + else 127 + cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" 143 128 fi 144 129 145 130 if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then