Showing the changes to scripts (1 of 1 file). Show all
Unified · Split
| @@ -89,6 +89,20 @@ if [ "$ARCH" = "um" ] ; then · 88 unmodified lines | |||
| 89 | packagename=user-mode-linux-$version | 89 | packagename=user-mode-linux-$version |
| 90 | fi | 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 | BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" | 106 | BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" |
| 93 | 107 | ||
| 94 | # Setup the directory structure | 108 | # Setup the directory structure |
| @@ -116,16 +130,15 @@ if [ "$ARCH" = "um" ] ; then · 21 unmodified lines | |||
| 116 | cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" | 130 | cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" |
| 117 | cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" | 131 | cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" |
| 118 | gzip "$tmpdir/usr/share/doc/$packagename/config" | 132 | gzip "$tmpdir/usr/share/doc/$packagename/config" |
| 119 | cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" | ||
| 120 | else | 133 | else |
| 121 | cp System.map "$tmpdir/boot/System.map-$version" | 134 | cp System.map "$tmpdir/boot/System.map-$version" |
| 122 | cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" | 135 | cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" |
| 123 | # Not all arches include the boot path in KBUILD_IMAGE | 136 | fi |
| 124 | if [ -e $KBUILD_IMAGE ]; then | 137 | # Not all arches include the boot path in KBUILD_IMAGE |
| 125 | cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" | 138 | if [ -e $KBUILD_IMAGE ]; then |
| 126 | else | 139 | cp $KBUILD_IMAGE "$tmpdir/$installed_image_path" |
| 127 | cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" | 140 | else |
| 128 | fi | 141 | cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" |
| 129 | fi | 142 | fi |
| 130 | 143 | ||
| 131 | if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then | 144 | if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then |