diff mbox

[2/2] apply-patches.sh: don't print anything when "make -s" is used

Message ID 1413994811-19452-3-git-send-email-fabio.porcedda@gmail.com
State Accepted
Headers show

Commit Message

Fabio Porcedda Oct. 22, 2014, 4:20 p.m. UTC 
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@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 Makefile                         |  2 ++
 package/Makefile.in              |  2 +-
 support/scripts/apply-patches.sh | 17 ++++++++++++++---
 3 files changed, 17 insertions(+), 4 deletions(-)

Comments

Peter Korsgaard Oct. 24, 2014, 11:44 p.m. UTC | #1 
>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:

 > 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.

Your patch actually sets it to 'y', not "YES". We also already have the
QUIET variable basically doing the same stuff, so I've changed it to use
that instead.

I see that you filter out --%, which we currently aren't doing
for QUIET. Should we?

Committed with that fixed, thanks.
Fabio Porcedda Oct. 27, 2014, 3:21 p.m. UTC | #2 
On Sat, Oct 25, 2014 at 1:44 AM, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "Fabio" == Fabio Porcedda <fabio.porcedda@gmail.com> writes:
>
>  > 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.
>
> Your patch actually sets it to 'y', not "YES". We also already have the
> QUIET variable basically doing the same stuff, so I've changed it to use
> that instead.

Thanks for the correction, i didn't know that the "QUIET" variable was
doing the same as BR_SILENT.

> I see that you filter out --%, which we currently aren't doing
> for QUIET. Should we?

We should because otherwise even a "make --warn-undefined-variables"
is detected as a silent build.

I've sent a patch to fix that:
http://patchwork.ozlabs.org/patch/403632/

Thanks & BR
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 907a0fc..c573740 100644
--- a/Makefile
+++ b/Makefile
@@ -202,6 +202,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 4a434ab..73767f1 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@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