summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2024-04-22 17:46:10 +0200
committerMasahiro Yamada <masahiroy@kernel.org>2024-05-02 12:48:26 +0200
commit2b1ab140506822dfc4711be08ea46fb4a83bf1ea (patch)
tree816f260b1e2d6894808fb4eed27d1d08f12f4b73
parentkconfig: remove unneeded if-conditional in conf_choice() (diff)
downloadlinux-2b1ab140506822dfc4711be08ea46fb4a83bf1ea.tar.xz
linux-2b1ab140506822dfc4711be08ea46fb4a83bf1ea.zip
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. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
-rwxr-xr-xscripts/package/buildtar12
1 files changed, 1 insertions, 11 deletions
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index ed8d9b496305..fe816f62a290 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -59,9 +59,6 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
# build tree.
#
case "${ARCH}" in
- x86|i386|x86_64)
- cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
- ;;
alpha)
cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
;;
@@ -110,13 +107,6 @@ case "${ARCH}" in
done
;;
*)
- cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
- echo "" >&2
- echo '** ** ** WARNING ** ** **' >&2
- echo "" >&2
- echo "Your architecture did not define any architecture-dependent files" >&2
- echo "to be placed into the tarball. Please add those to ${0} ..." >&2
- echo "" >&2
- sleep 5
+ cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
;;
esac