[Buildroot] [PATCH v6 branch/next 2/2] apply-patches.sh: don't print anything when "make -s" is used
Yann E. MORIN
yann.morin.1998 at free.fr
Fri Aug 29 12:00:11 UTC 2014
Fabio, All,
On 2014-08-29 11:20 +0200, Fabio Porcedda spake thusly:
> The make "-s" option is used to enable the "Silent operation" so if that
> option is used don't print anything as far as there isn't any error.
>
> Add the "-s" option to "apply-patches.sh" to enable silent operation.
>
> Also add the "BR_SILENT" variable the contain "YES" when "make -s" is
> used so others parts can use it to silence the build as well.
>
> Signed-off-by: Fabio Porcedda <fabio.porcedda at gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> ---
> Makefile | 2 ++
> package/Makefile.in | 2 +-
> support/scripts/apply-patches.sh | 17 ++++++++++++++---
> 3 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 46b2128..dc7f085 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -198,6 +198,8 @@ else
> Q = @
> endif
>
> +BR_SILENT = $(if $(findstring s, $(filter-out --%, $(MAKEFLAGS))), y)
> +
> # we want bash as shell
> SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
> else if [ -x /bin/bash ]; then echo /bin/bash; \
> diff --git a/package/Makefile.in b/package/Makefile.in
> index bf22123..91cb3b8 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -222,7 +222,7 @@ FLEX := $(shell which flex || type -p flex)
> BISON := $(shell which bison || type -p bison)
> SED := $(shell which sed || type -p sed) -i -e
>
> -APPLY_PATCHES = support/scripts/apply-patches.sh
> +APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(BR_SILENT), -s)
>
> HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include
> HOST_CFLAGS ?= -O2
> diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh
> index 37f2d81..b32d592 100755
> --- a/support/scripts/apply-patches.sh
> +++ b/support/scripts/apply-patches.sh
> @@ -6,6 +6,8 @@
> # (c) 2002 Erik Andersen <andersen at codepoet.org>
> #
> # Parameters:
> +# - "-s", optional. Silent operation, don't print anything if there
> +# isn't any error.
> # - the build directory, optional, default value is '.'. The place where are
> # the package sources.
> # - the patch directory, optional, default '../kernel-patches'. The place
> @@ -28,6 +30,13 @@
> # applied. The list of the patches applied is stored in '.applied_patches_list'
> # file in the build directory.
>
> +silent=
> +if [ "$1" = "-s" ] ; then
> + # add option to be used by the patch tool
> + silent=-s
> + shift
> +fi
> +
> # Set directories from arguments, or use defaults.
> builddir=${1-.}
> patchdir=${2-../kernel-patches}
> @@ -77,14 +86,16 @@ function apply_patch {
> return 0
> ;;
> esac
> - echo ""
> - echo "Applying $patch using ${type}: "
> + if [ -z "$silent" ] ; then
> + echo ""
> + echo "Applying $patch using ${type}: "
> + fi
> if [ ! -e "${path}/$patch" ] ; then
> echo "Error: missing patch file ${path}/$patch"
> exit 1
> fi
> echo $patch >> ${builddir}/.applied_patches_list
> - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N
> + ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N $silent
> if [ $? != 0 ] ; then
> echo "Patch failed! Please fix ${patch}!"
> exit 1
> --
> 2.1.0
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list