| Message ID | 1406892298-9460-3-git-send-email-fabio.porcedda@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Fabio, All, On 2014-08-01 13:24 +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@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> HOwever, I have a comment about it, see below... > --- > 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 c82b07f..73eb033 100644 > --- a/Makefile > +++ b/Makefile > @@ -198,6 +198,8 @@ else > Q = @ > endif > > +BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) Unfortunately, that also matches '--warn-undefined-variables' since it has an 's' in it. It is the onlt long option with an 's' in it, for which there is no corresponding short option. All other long options with an 's' in them have corresponding short options, and that's what appears in MAKEFLAGS. I think we can well live with the fact that --warn-undefined-variables would trigger a silent patching, because this should really only be rarely used, if at all, because we do rely on variables not being defined, so this is not an error, not even a warning. That's why I added my reviewed tag. Regards, Yann E. MORIN. > # 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 d17115b..c00c4f3 100644 > --- a/package/Makefile.in > +++ b/package/Makefile.in > @@ -218,7 +218,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..16e0b41 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 $silent -g0 -p1 -E -d "${builddir}" -t -N > if [ $? != 0 ] ; then > echo "Patch failed! Please fix ${patch}!" > exit 1 > -- > 2.0.3 >
On Wed, Aug 6, 2014 at 9:16 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Fabio, All, > > On 2014-08-01 13:24 +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@gmail.com> > > Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > > HOwever, I have a comment about it, see below... > >> --- >> 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 c82b07f..73eb033 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -198,6 +198,8 @@ else >> Q = @ >> endif >> >> +BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) > > Unfortunately, that also matches '--warn-undefined-variables' since it > has an 's' in it. It is the onlt long option with an 's' in it, for > which there is no corresponding short option. All other long options > with an 's' in them have corresponding short options, and that's what > appears in MAKEFLAGS. Good point, I was confused by the official documentation of Make: http://www.gnu.org/software/make/manual/make.html#Testing-Flags Using the filter function instead of substring fix the problem: -BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) +BR_SILENT = $(if $(filter s -s,$(MAKEFLAGS)),YES) I will send an updated patch. > I think we can well live with the fact that --warn-undefined-variables > would trigger a silent patching, because this should really only be > rarely used, if at all, because we do rely on variables not being > defined, so this is not an error, not even a warning. > > That's why I added my reviewed tag. Thanks
diff --git a/Makefile b/Makefile index c82b07f..73eb033 100644 --- a/Makefile +++ b/Makefile @@ -198,6 +198,8 @@ else Q = @ endif +BR_SILENT = $(if $(findstring s,$(MAKEFLAGS)),YES) + # 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 d17115b..c00c4f3 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -218,7 +218,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..16e0b41 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 $silent -g0 -p1 -E -d "${builddir}" -t -N if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1
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> --- Makefile | 2 ++ package/Makefile.in | 2 +- support/scripts/apply-patches.sh | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 4 deletions(-)