Hi Sascha,
Sorry for my late reply.
2017-05-15 2:09 GMT+09:00 Sascha Silbe <[email protected]>:
> buildtar warns when an architecture doesn't have an explicit rule on
> what files to copy, even when the generic rule works just fine. Add a
> rule for ARM that does the same as the explicit rule, but avoids the
> warning.
>
> Signed-off-by: Sascha Silbe <[email protected]>
> ---
> v1→v2: rebased on top of todays linus master, including commit 152e6744ebfc
>
> Not duplicating the rule would have been nice from a maintenance point
> of view, but doesn't fit the current code structure very well. It also
> avoids breakage if the generic rule ever gets adjusted to something
> else that doesn't work for ARM.
>
>
> scripts/package/buildtar | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/scripts/package/buildtar b/scripts/package/buildtar
> index e046bff33589..ea84ba67619b 100755
> --- a/scripts/package/buildtar
> +++ b/scripts/package/buildtar
> @@ -108,6 +108,9 @@ case "${ARCH}" in
> cp -v -- "${objtree}/vmlinux"
> "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
> fi
> ;;
> + arm)
> + [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}"
> "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
> + ;;
> *)
> [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}"
> "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
> echo "" >&2
I do not get why we need to add a separate entry
to avoid the WARNING.
With KBUILD_IMAGE fixed, mkspec and builddeb now
handle the kernel image in an (almost) arch-agnostic way.
I think the WARNING can be simply removed from the default case.
Also, could you rename vmlinux-kbuild-${KERNELRELEASE}
to vmlinuz-${KERNELRELEASE} in order to align with mkspec/builddeb?
Then, x86|i386|x86_64 can be merged into the default case.
--
Best Regards
Masahiro Yamada
