summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.com>2016-11-22 22:34:34 +0100
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-03-20 22:42:21 +0900
commit09549aa1baa90d9e273ecd6c69c493bea6473dec (patch)
tree459ada3e9f9e357833861dddda4fdc53eb2997b8 /scripts
parent41f5b8db796fdea5d5265798add260e66d44276b (diff)
downloadlinux-09549aa1baa90d9e273ecd6c69c493bea6473dec.tar.gz
linux-09549aa1baa90d9e273ecd6c69c493bea6473dec.tar.bz2
linux-09549aa1baa90d9e273ecd6c69c493bea6473dec.zip
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/package/builddeb7
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 3c575cd07888..f04e91f0845d 100755
--- 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