[Buildroot] [PATCH 1/1] support/scripts/apply-patches.sh: handle tar and mkdir failures
Romain Naour
romain.naour at gmail.com
Tue Jul 5 10:40:30 UTC 2016
Hi Sébastien,
Le 25/05/2016 à 14:13, Sébastien Szymanski a écrit :
> With several archives in a space-separated list of patches, if one archive
> cannot be untar (i.e because it is not readable), Buildroot keeps going instead
> of aborting. Fix this by checking the tar return code.
> While at it, check if the unpack archive directory creation is successful.
>
> Signed-off-by: Sébastien Szymanski <sebastien.szymanski at armadeus.com>
> ---
> support/scripts/apply-patches.sh | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
> index 201278d..b0a8ad4 100755
> --- a/support/scripts/apply-patches.sh
> +++ b/support/scripts/apply-patches.sh
> @@ -132,7 +132,11 @@ function scan_patchdir {
> unpackedarchivedir="$builddir/.patches-$(basename $i)-unpacked"
> rm -rf "$unpackedarchivedir" 2> /dev/null
> mkdir "$unpackedarchivedir"
> - tar -C "$unpackedarchivedir" -xaf "${path}/$i"
> + if [ $? != 0 ] ; then
> + echo "Error: cannot create $unpackedarchivedir directory."
> + exit 1
> + fi
I don't see why mkdir can fail here.
> + tar -C "$unpackedarchivedir" -xaf "${path}/$i" || exit 1
Ok with the check.
Best regards,
Romain
> scan_patchdir "$unpackedarchivedir"
> else
> apply_patch "$path" "$i"
>
More information about the buildroot
mailing list