Re: [PATCH 6/6] deb-pkg: Remove the KBUILD_IMAGE workaround

[Riku Voipio]

On 22 November 2016 at 23:34, Michal Marek <mmarek@xxxxxxxx> wrote:
> 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@xxxxxxxx>
> ---
Thanks for cleaning this up.

Reviewed-by: Riku Voipio <riku.voipio@xxxxxxxxxx>

>  scripts/package/builddeb | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 8ea9fd2b6573..dab997343f1a 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
> --
> 2.10.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html