deb-pkg: Remove the KBUILD_IMAGE workaround

The arch Makefile are fixed to set KBUILD_IMAGE to the full patch, so
the workaround is no longer needed.

Signed-off-by: Michal Marek <mmarek@suse.com>
Reviewed-by: Riku Voipio <riku.voipio@linaro.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 3c575cd07888807d14693ad8475b6b5a953a1ca4..f04e91f0845d84a6229f04f852f0f96a7272a787 100755 (executable)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -143,12 +143,7 @@ else
        cp System.map "$tmpdir/boot/System.map-$version"
        cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
 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
+cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"
 
 if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
        # Only some architectures with OF support have this target