Skip to contentSkip to conversation

buildtar: fix tarballs with EFI_ZBOOT enabled

PATCH In review Veronika Kabatova 2 participants 2 messages Dec 14, 2022 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 buildtar: fix tarballs with EFI_ZBOOT enabled

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.

---
 scripts/package/buildtar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/package/buildtar +1 -1
index cb54c7f1aa80..4d6f0b128efd 100755
@@ -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
Signature · 1 line
2.38.1
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Veronika Kabatova

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.

Thanks for the patch.

I think the same change should be applied to risc-v as well, cc'ing Palmer.

Quoted 20 lines
---
 scripts/package/buildtar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/package/buildtar +1 -2
index cb54c7f1aa80..4d6f0b128efd 100755
@@ -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