On 21/03/2024 15:43, Nathan Chancellor wrote:
> On Thu, Mar 21, 2024 at 11:58:51AM +0000, Matt Coster wrote:
>> From: Karolis Mituzas <karolis.mituzas@xxxxxxxxxx>
>>
>> This matches the behavior for arm64 [1] and prevents clobbering of
>> vmlinux-${KERNELRELEASE}.
>>
>> [1]: commit 0df57d90bfd6 ("kbuild: buildtar: add arm64 support")
>>
>> Fixes: 7d0bc44bd0ea ("kbuild: buildtar: add riscv support")
>> Signed-off-by: Karolis Mituzas <karolis.mituzas@xxxxxxxxxx>
>> Signed-off-by: Matt Coster <matt.coster@xxxxxxxxxx>
>> ---
>> scripts/package/buildtar | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/package/buildtar b/scripts/package/buildtar
>> index 72c91a1b832f..a36aca2a27cc 100755
>> --- a/scripts/package/buildtar
>> +++ b/scripts/package/buildtar
>> @@ -96,7 +96,7 @@ case "${ARCH}" in
>> riscv)
>> for i in Image.bz2 Image.gz Image; do
>
> This patch seems fine but it does introduce a slight inconsistency with
> the rest of this script, as vmlinuz implies a compressed boot image but
> Image is not compressed. Probably does not really matter but I feel like
> it is worth mentioning.
I agree this doesn't seem like the perfect solution, but I'm not sure
what that would look like. We could easily pull the Image case out of
the loop and use vmlinux there, but then the original vmlinux would
still be clobbered.
>> if [ -f "${objtree}/arch/riscv/boot/${i}" ] ; then
>> - cp -v -- "${objtree}/arch/riscv/boot/${i}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
>> + cp -v -- "${objtree}/arch/riscv/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
>> break
>> fi
>> done
>> --
>> 2.44.0
>>
Attachment:
OpenPGP_signature.asc
Description: OpenPGP digital signature
