[v2] kbuild: buildtar: Add explicit 32-bit arm support

[RESEND PATCH v2] kbuild: buildtar: Add explicit 32-bit arm support

Posted by Calvin Owens 1 year, 5 months ago

Implement buildtar for 32-bit arm, so the zImage (or xipimage) appears
at boot/vmlinuz-$foo, rather than at boot/vmlinux-kbuild-$foo, matching
the structure of the tar-pkg on arm64 and other architectures.

Link: https://lore.kernel.org/all/ZhmKzqxHXaSZmXee@mozart.vkv.me/
Signed-off-by: Calvin Owens <calvin@wbinvd.org>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
---
 scripts/package/buildtar | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index eb67787f8673..23d7ff675396 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -104,6 +104,9 @@ case "${ARCH}" in
 				cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}";;
 		esac
 		;;
+	arm)
+		[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+		;;
 	*)
 		cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
 		;;
-- 
2.39.2

Re: [RESEND PATCH v2] kbuild: buildtar: Add explicit 32-bit arm support

Posted by Nathan Chancellor 1 year, 5 months ago

Hi Calvin,

On Thu, Jun 20, 2024 at 07:25:59PM -0700, Calvin Owens wrote:
> Implement buildtar for 32-bit arm, so the zImage (or xipimage) appears
> at boot/vmlinuz-$foo, rather than at boot/vmlinux-kbuild-$foo, matching
> the structure of the tar-pkg on arm64 and other architectures.
> 
> Link: https://lore.kernel.org/all/ZhmKzqxHXaSZmXee@mozart.vkv.me/
> Signed-off-by: Calvin Owens <calvin@wbinvd.org>
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
>  scripts/package/buildtar | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/scripts/package/buildtar b/scripts/package/buildtar
> index eb67787f8673..23d7ff675396 100755
> --- a/scripts/package/buildtar
> +++ b/scripts/package/buildtar
> @@ -104,6 +104,9 @@ case "${ARCH}" in
>  				cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}";;
>  		esac
>  		;;
> +	arm)
> +		[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
> +		;;
>  	*)
>  		cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
>  		;;
> -- 
> 2.39.2
> 

Is this change necessary after commit 2b1ab1405068 ("kbuild: buildtar:
remove warning for the default case")? Without the '[ -f ... ] &&' part
of the expression, which was removed for other cases in
commit c3f7bed8fa14 ("kbuild: buildtar: add comments about inconsistent
package generation"), it appears to be the same thing.

Cheers,
Nathan

Re: [RESEND PATCH v2] kbuild: buildtar: Add explicit 32-bit arm support

Posted by Calvin Owens 1 year, 5 months ago

On Friday 06/21 at 07:55 -0700, Nathan Chancellor wrote:
> Hi Calvin,
> 
> On Thu, Jun 20, 2024 at 07:25:59PM -0700, Calvin Owens wrote:
> > Implement buildtar for 32-bit arm, so the zImage (or xipimage) appears
> > at boot/vmlinuz-$foo, rather than at boot/vmlinux-kbuild-$foo, matching
> > the structure of the tar-pkg on arm64 and other architectures.
> > 
> > Link: https://lore.kernel.org/all/ZhmKzqxHXaSZmXee@mozart.vkv.me/
> > Signed-off-by: Calvin Owens <calvin@wbinvd.org>
> > Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> > ---
> >  scripts/package/buildtar | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/scripts/package/buildtar b/scripts/package/buildtar
> > index eb67787f8673..23d7ff675396 100755
> > --- a/scripts/package/buildtar
> > +++ b/scripts/package/buildtar
> > @@ -104,6 +104,9 @@ case "${ARCH}" in
> >  				cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}";;
> >  		esac
> >  		;;
> > +	arm)
> > +		[ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
> > +		;;
> >  	*)
> >  		cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
> >  		;;
> > -- 
> > 2.39.2
> > 
> 
> Is this change necessary after commit 2b1ab1405068 ("kbuild: buildtar:
> remove warning for the default case")? Without the '[ -f ... ] &&' part
> of the expression, which was removed for other cases in
> commit c3f7bed8fa14 ("kbuild: buildtar: add comments about inconsistent
> package generation"), it appears to be the same thing.

Oops. Sorry for the noise.

Thanks,
Calvin

> Cheers,
> Nathan