Skip to content

Commit 2b1ab14

Browse files
committed
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>
1 parent c2af3d0 commit 2b1ab14

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

scripts/package/buildtar

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@ cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
5959
# build tree.
6060
#
6161
case "${ARCH}" in
62-
x86|i386|x86_64)
63-
cp -v -- "${objtree}/arch/x86/boot/bzImage" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
64-
;;
6562
alpha)
6663
cp -v -- "${objtree}/arch/alpha/boot/vmlinux.gz" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
6764
;;
@@ -110,13 +107,6 @@ case "${ARCH}" in
110107
done
111108
;;
112109
*)
113-
cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${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
110+
cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
121111
;;
122112
esac

0 commit comments

Comments
 (0)