History

kbuild: buildtar: remove warning for the default case

Given KBUILD_IMAGE properly set in arch/*/Makefile, the default case should work in most scenarios. The only oddity is the naming of the copy destination, vmlinux-kbuild-${KERNELRELEASE}. Let's rename it to vmlinuz-${KERNELRELEASE} because the kernel is often compressed. Remove the warning to avoid unnecessary patch submissions when the default case suffices. Remove the x86 case, which is now equivalent to the default.

Masahiro Yamada committed 2 years ago

Commit 2b1ab141 parent c2af3d01 file · +1 −11Browse files

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/package/buildtar+1−11
@@ -59,9 +59,6 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}" · 58 unmodified lines
59# build tree.59# build tree.
60#60#
61case "${ARCH}" in61case "${ARCH}" in
62 x86|i386|x86_64)
63 cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
64 ;;
65 alpha)62 alpha)
66 cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"63 cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
67 ;;64 ;;
@@ -110,13 +107,6 @@ case "${ARCH}" in · 42 unmodified lines
110 done107 done
111 ;;108 ;;
112 *)109 *)
113 cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"110 cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
114 echo "" >&2
115 echo '** ** ** WARNING ** ** **' >&2
116 echo "" >&2
117 echo "Your architecture did not define any architecture-dependent files" >&2
118 echo "to be placed into the tarball. Please add those to ${0} ..." >&2
119 echo "" >&2
120 sleep 5
121 ;;111 ;;
122esac112esac