Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77780f79 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: buildtar: do not print successful message if tar returns error 



The previous commit spotted that "Tarball successfully created ..."
is displayed even if the "tar" command returns error code because
it is followed by "| ${compress}".

Let the build fail instead of printing the successful message since
if the "tar" command fails, the output may not be what users expect.

Avoid the use of the pipe.  While we are here, refactor the script
removing the use of sub-shell, ${compress}, ${file_ext}.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent dd965f1f

scripts/package/buildtar

+13 −16
Original line number Diff line number Diff line
@@ -24,20 +24,19 @@ tarball="${objtree}/linux-${KERNELRELEASE}-${ARCH}.tar" 
#

case "${1}" in

	tar-pkg)

		compress="cat"

		file_ext=""

		opts=

		;;

	targz-pkg)

		compress="gzip"

		file_ext=".gz"

		opts=--gzip

		tarball=${tarball}.gz

		;;

	tarbz2-pkg)

		compress="bzip2"

		file_ext=".bz2"

		opts=--bzip2

		tarball=${tarball}.bz2

		;;

	tarxz-pkg)

		compress="xz"

		file_ext=".xz"

		opts=--xz

		tarball=${tarball}.xz

		;;

	*)

		echo "Unknown tarball target \"${1}\" requested, please add it to ${0}." >&2
@@ -125,14 +124,12 @@ esac 
#

# Create the tarball

#

(

	opts=

if tar --owner=root --group=root --help >/dev/null 2>&1; then

		opts="--owner=root --group=root"

	opts="$opts --owner=root --group=root"

fi

	tar cf - -C "$tmpdir" $dirs $opts | ${compress} > "${tarball}${file_ext}"

)



echo "Tarball successfully created in ${tarball}${file_ext}"

tar cf $tarball -C $tmpdir $opts $dirs



echo "Tarball successfully created in $tarball"



exit 0