| Message ID | 20221214132002.2547357-1-vkabatov@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | buildtar: fix tarballs with EFI_ZBOOT enabled | expand |
On Wed, 14 Dec 2022 at 14:20, Veronika Kabatova <vkabatov@redhat.com> wrote: > > When CONFIG_EFI_ZBOOT is enabled, the binary name is not Image.gz > anymore but vmlinuz.efi. No vmlinuz gets put into the tarball as the > buildtar script doesn't recognize this name. Remedy this by adding the > binary name to the list of acceptable files to package. > > Reported-by: CKI Project <cki-project@redhat.com> > Signed-off-by: Veronika Kabatova <vkabatov@redhat.com> Thanks for the patch. I think the same change should be applied to risc-v as well, cc'ing Palmer. Acked-by: Ard Biesheuvel <ardb@kernel.org> > --- > scripts/package/buildtar | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/package/buildtar b/scripts/package/buildtar > index cb54c7f1aa80..4d6f0b128efd 100755 > --- a/scripts/package/buildtar > +++ b/scripts/package/buildtar > @@ -122,7 +122,7 @@ case "${ARCH}" in > fi > ;; > arm64) > - for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do > + for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo vmlinuz.efi ; do > if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then > cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" > break > -- > 2.38.1 >
diff --git a/scripts/package/buildtar b/scripts/package/buildtar index cb54c7f1aa80..4d6f0b128efd 100755 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar @@ -122,7 +122,7 @@ case "${ARCH}" in fi ;; arm64) - for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do + for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo vmlinuz.efi ; do if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}" break
When CONFIG_EFI_ZBOOT is enabled, the binary name is not Image.gz anymore but vmlinuz.efi. No vmlinuz gets put into the tarball as the buildtar script doesn't recognize this name. Remedy this by adding the binary name to the list of acceptable files to package. Reported-by: CKI Project <cki-project@redhat.com> Signed-off-by: Veronika Kabatova <vkabatov@redhat.com> --- scripts/package/buildtar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)