[Buildroot] [PATCH v5 0/4] Improve silent builds

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v5 0/4]  Improve silent builds
@ 2014-12-23  8:54 Fabio Porcedda
  2014-12-23  8:54 ` [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance Fabio Porcedda
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-23  8:54 UTC (permalink / raw)
  To: buildroot

This patch set improves silent builds.

Silent builds are also nice when top-level parallel make is being used
to reduce the output clutter.

After this patch set is accepted I will prepare a patch set to convert
the other helpers (scp wget hg) to use the quiet flag instead of the
environment variable.

The change logs are in each patch.

Fabio Porcedda (4):
  Rename the variable "QUIET" to "BR_QUIET" for conformance
  Makefile: improve detection of make "-s" flag
  support/download: silence svn if it is a silent build
  support/download: silence git if it is a silent build

 Makefile                           |  2 +-
 package/Makefile.in                |  2 +-
 package/berkeleydb/berkeleydb.mk   |  2 +-
 package/gcc/gcc-final/gcc-final.mk |  2 +-
 package/pkg-autotools.mk           |  4 ++--
 package/pkg-download.mk            | 10 ++++++----
 support/download/dl-wrapper        | 11 ++++++++---
 support/download/git               | 27 +++++++++++++++++++++++----
 support/download/svn               | 17 ++++++++++++++++-
 9 files changed, 59 insertions(+), 18 deletions(-)

-- 
2.2.1

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-23  8:54 [Buildroot] [PATCH v5 0/4] Improve silent builds Fabio Porcedda
@ 2014-12-23  8:54 ` Fabio Porcedda
  2014-12-23 10:17   ` Thomas Petazzoni
  2014-12-23  8:54 ` [Buildroot] [PATCH v5 2/4] Makefile: improve detection of make "-s" flag Fabio Porcedda
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-23  8:54 UTC (permalink / raw)
  To: buildroot

Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
that internal variables should be named BR_XXX.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---

Notes:
    v5:
     - add this patch (Yann)

 Makefile                           | 2 +-
 package/Makefile.in                | 2 +-
 package/berkeleydb/berkeleydb.mk   | 2 +-
 package/gcc/gcc-final/gcc-final.mk | 2 +-
 package/pkg-autotools.mk           | 4 ++--
 package/pkg-download.mk            | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 10445a2..3baa709 100644
--- a/Makefile
+++ b/Makefile
@@ -303,7 +303,7 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
 TARGETS :=
 
 # silent mode requested?
-QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
+BR_QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
 
 # Strip off the annoying quoting
 ARCH := $(call qstrip,$(BR2_ARCH))
diff --git a/package/Makefile.in b/package/Makefile.in
index a63a2e8..bad49c3 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -223,7 +223,7 @@ BISON := $(shell which bison || type -p bison)
 SED := $(shell which sed || type -p sed) -i -e
 UNZIP := $(shell which unzip || type -p unzip) -q
 
-APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(QUIET),-s)
+APPLY_PATCHES = support/scripts/apply-patches.sh $(if $(BR_QUIET),-s)
 
 HOST_CPPFLAGS  = -I$(HOST_DIR)/usr/include
 HOST_CFLAGS   ?= -O2
diff --git a/package/berkeleydb/berkeleydb.mk b/package/berkeleydb/berkeleydb.mk
index 30fc518..a7b8a70 100644
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@@ -25,7 +25,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 	(cd $(@D)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		../dist/configure $(QUIET) \
+		../dist/configure $(BR_QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index c014bc5..875579c 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -36,7 +36,7 @@ define  HOST_GCC_FINAL_CONFIGURE_CMDS
 		--prefix="$(HOST_DIR)/usr" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 		--enable-static \
-		$(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
+		$(BR_QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
 	)
 endef
 
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index b20e20e..4bad10f 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -204,7 +204,7 @@ define $(2)_CONFIGURE_CMDS
 		$$(DISABLE_IPV6) \
 		$$(ENABLE_DEBUG) \
 		$$(SHARED_STATIC_LIBS_OPTS) \
-		$$(QUIET) $$($$(PKG)_CONF_OPTS) \
+		$$(BR_QUIET) $$($$(PKG)_CONF_OPTS) \
 	)
 endef
 else
@@ -233,7 +233,7 @@ define $(2)_CONFIGURE_CMDS
 		--with-xmlto=no \
 		--with-fop=no \
 		--disable-dependency-tracking \
-		$$(QUIET) $$($$(PKG)_CONF_OPTS) \
+		$$(BR_QUIET) $$($$(PKG)_CONF_OPTS) \
 	)
 endef
 endif
diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index ba72fc1..884daff 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -8,14 +8,14 @@
 ################################################################################
 
 # Download method commands
-export WGET := $(call qstrip,$(BR2_WGET)) $(QUIET)
+export WGET := $(call qstrip,$(BR2_WGET)) $(BR_QUIET)
 export SVN := $(call qstrip,$(BR2_SVN))
 export CVS := $(call qstrip,$(BR2_CVS))
 export BZR := $(call qstrip,$(BR2_BZR))
 export GIT := $(call qstrip,$(BR2_GIT))
-export HG := $(call qstrip,$(BR2_HG)) $(QUIET)
-export SCP := $(call qstrip,$(BR2_SCP)) $(QUIET)
-SSH := $(call qstrip,$(BR2_SSH)) $(QUIET)
+export HG := $(call qstrip,$(BR2_HG)) $(BR_QUIET)
+export SCP := $(call qstrip,$(BR2_SCP)) $(BR_QUIET)
+SSH := $(call qstrip,$(BR2_SSH)) $(BR_QUIET)
 export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES))
 
 DL_WRAPPER = support/download/dl-wrapper
-- 
2.2.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-23  8:54 ` [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance Fabio Porcedda
@ 2014-12-23 10:17   ` Thomas Petazzoni
  2014-12-23 10:51     ` Fabio Porcedda
  0 siblings, 1 reply; 11+ messages in thread
From: Thomas Petazzoni @ 2014-12-23 10:17 UTC (permalink / raw)
  To: buildroot

Hello,

On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
> that internal variables should be named BR_XXX.
> 
> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>

Do we really want all internal variables to be named BR_* ? Like
HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
I'm not sure we want to do this, do we?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-23 10:17   ` Thomas Petazzoni
@ 2014-12-23 10:51     ` Fabio Porcedda
  2014-12-28 16:24       ` Fabio Porcedda
  0 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-23 10:51 UTC (permalink / raw)
  To: buildroot

On Tue, Dec 23, 2014 at 11:17 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
>> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
>> that internal variables should be named BR_XXX.
>>
>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>
> Do we really want all internal variables to be named BR_* ? Like
> HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
> I'm not sure we want to do this, do we?

On Wed, Nov 26, 2014 at 10:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
<snip>
> Also, in retrospect, QUIET was not a really good name for this variable
> in the Makefile. It would have been better if it were named BR_QUIET.
> But that was introduced way before we decided on a variable naming
> convention... :-/

So which naming conventions Yann was referring?

BR
-- 
Fabio Porcedda

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-23 10:51     ` Fabio Porcedda
@ 2014-12-28 16:24       ` Fabio Porcedda
  2014-12-28 21:57         ` Yann E. MORIN
  0 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-28 16:24 UTC (permalink / raw)
  To: buildroot

On Tue, Dec 23, 2014 at 11:51 AM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> On Tue, Dec 23, 2014 at 11:17 AM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
>> Hello,
>>
>> On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
>>> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
>>> that internal variables should be named BR_XXX.
>>>
>>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>>
>> Do we really want all internal variables to be named BR_* ? Like
>> HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
>> I'm not sure we want to do this, do we?
>
> On Wed, Nov 26, 2014 at 10:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> <snip>
>> Also, in retrospect, QUIET was not a really good name for this variable
>> in the Makefile. It would have been better if it were named BR_QUIET.
>> But that was introduced way before we decided on a variable naming
>> convention... :-/
>
> So which naming conventions Yann was referring?

Hi Yann,
Can you please explain further your opinion?

BR
-- 
Fabio Porcedda

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-28 16:24       ` Fabio Porcedda
@ 2014-12-28 21:57         ` Yann E. MORIN
  2014-12-30 10:59           ` Fabio Porcedda
  0 siblings, 1 reply; 11+ messages in thread
From: Yann E. MORIN @ 2014-12-28 21:57 UTC (permalink / raw)
  To: buildroot

Fabio, All,

On 2014-12-28 17:24 +0100, Fabio Porcedda spake thusly:
> On Tue, Dec 23, 2014 at 11:51 AM, Fabio Porcedda
> <fabio.porcedda@gmail.com> wrote:
> > On Tue, Dec 23, 2014 at 11:17 AM, Thomas Petazzoni
> > <thomas.petazzoni@free-electrons.com> wrote:
> >> Hello,
> >>
> >> On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
> >>> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
> >>> that internal variables should be named BR_XXX.
> >>>
> >>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
> >>
> >> Do we really want all internal variables to be named BR_* ? Like
> >> HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
> >> I'm not sure we want to do this, do we?
> >
> > On Wed, Nov 26, 2014 at 10:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > <snip>
> >> Also, in retrospect, QUIET was not a really good name for this variable
> >> in the Makefile. It would have been better if it were named BR_QUIET.
> >> But that was introduced way before we decided on a variable naming
> >> convention... :-/
> >
> > So which naming conventions Yann was referring?
> 
> Hi Yann,
> Can you please explain further your opinion?

Oh, sorry, it seems I was not explicit enough in my mail...

What I said was "QUIET was not a really good name [...] that was
introduced way before we decided on a variable naming convention..."

I did not want to make it sound like we should rename it, sorry.

I agree with Thomas here: we should keep QUIET as-is.

Sorry, sorry for the confusion... :-(

Regards,
Yann E. MORIN.

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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-28 21:57         ` Yann E. MORIN
@ 2014-12-30 10:59           ` Fabio Porcedda
  2014-12-30 11:43             ` Fabio Porcedda
  0 siblings, 1 reply; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-30 10:59 UTC (permalink / raw)
  To: buildroot

On Sun, Dec 28, 2014 at 10:57 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Fabio, All,
>
> On 2014-12-28 17:24 +0100, Fabio Porcedda spake thusly:
>> On Tue, Dec 23, 2014 at 11:51 AM, Fabio Porcedda
>> <fabio.porcedda@gmail.com> wrote:
>> > On Tue, Dec 23, 2014 at 11:17 AM, Thomas Petazzoni
>> > <thomas.petazzoni@free-electrons.com> wrote:
>> >> Hello,
>> >>
>> >> On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
>> >>> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
>> >>> that internal variables should be named BR_XXX.
>> >>>
>> >>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>> >>
>> >> Do we really want all internal variables to be named BR_* ? Like
>> >> HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
>> >> I'm not sure we want to do this, do we?
>> >
>> > On Wed, Nov 26, 2014 at 10:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> > <snip>
>> >> Also, in retrospect, QUIET was not a really good name for this variable
>> >> in the Makefile. It would have been better if it were named BR_QUIET.
>> >> But that was introduced way before we decided on a variable naming
>> >> convention... :-/
>> >
>> > So which naming conventions Yann was referring?
>>
>> Hi Yann,
>> Can you please explain further your opinion?
>
> Oh, sorry, it seems I was not explicit enough in my mail...
>
> What I said was "QUIET was not a really good name [...] that was
> introduced way before we decided on a variable naming convention..."
>
> I did not want to make it sound like we should rename it, sorry.
>
> I agree with Thomas here: we should keep QUIET as-is.
>
> Sorry, sorry for the confusion... :-(

Ok, I will sent an updated patch set without the renaming patch.

BR
-- 
Fabio Porcedda

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance
  2014-12-30 10:59           ` Fabio Porcedda
@ 2014-12-30 11:43             ` Fabio Porcedda
  0 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-30 11:43 UTC (permalink / raw)
  To: buildroot

On Tue, Dec 30, 2014 at 11:59 AM, Fabio Porcedda
<fabio.porcedda@gmail.com> wrote:
> On Sun, Dec 28, 2014 at 10:57 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>> Fabio, All,
>>
>> On 2014-12-28 17:24 +0100, Fabio Porcedda spake thusly:
>>> On Tue, Dec 23, 2014 at 11:51 AM, Fabio Porcedda
>>> <fabio.porcedda@gmail.com> wrote:
>>> > On Tue, Dec 23, 2014 at 11:17 AM, Thomas Petazzoni
>>> > <thomas.petazzoni@free-electrons.com> wrote:
>>> >> Hello,
>>> >>
>>> >> On Tue, 23 Dec 2014 09:54:58 +0100, Fabio Porcedda wrote:
>>> >>> Rename the variable "QUIET" to "BR_QUIET" accordingly to the convention
>>> >>> that internal variables should be named BR_XXX.
>>> >>>
>>> >>> Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
>>> >>
>>> >> Do we really want all internal variables to be named BR_* ? Like
>>> >> HOST_CONFIGURE_OPTS, TARGET_CONFIGURE_OPTS, TARGET_MAKE_ENV and al. ?
>>> >> I'm not sure we want to do this, do we?
>>> >
>>> > On Wed, Nov 26, 2014 at 10:35 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>>> > <snip>
>>> >> Also, in retrospect, QUIET was not a really good name for this variable
>>> >> in the Makefile. It would have been better if it were named BR_QUIET.
>>> >> But that was introduced way before we decided on a variable naming
>>> >> convention... :-/
>>> >
>>> > So which naming conventions Yann was referring?
>>>
>>> Hi Yann,
>>> Can you please explain further your opinion?
>>
>> Oh, sorry, it seems I was not explicit enough in my mail...
>>
>> What I said was "QUIET was not a really good name [...] that was
>> introduced way before we decided on a variable naming convention..."
>>
>> I did not want to make it sound like we should rename it, sorry.
>>
>> I agree with Thomas here: we should keep QUIET as-is.
>>
>> Sorry, sorry for the confusion... :-(
>
> Ok, I will sent an updated patch set without the renaming patch.

I've sent an updated patch set:
http://lists.busybox.net/pipermail/buildroot/2014-December/116079.html

BR
-- 
Fabio Porcedda

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 2/4] Makefile: improve detection of make "-s" flag
  2014-12-23  8:54 [Buildroot] [PATCH v5 0/4] Improve silent builds Fabio Porcedda
  2014-12-23  8:54 ` [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance Fabio Porcedda
@ 2014-12-23  8:54 ` Fabio Porcedda
  2014-12-23  8:55 ` [Buildroot] [PATCH v5 3/4] support/download: silence svn if it is a silent build Fabio Porcedda
  2014-12-23  8:55 ` [Buildroot] [PATCH v5 4/4] support/download: silence git " Fabio Porcedda
  3 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-23  8:54 UTC (permalink / raw)
  To: buildroot

Because it's just checked the presence of the "s" character even a
  make --warn-undefined-variables
is detected as a silent build so fix this by filtering out long options.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
---

Notes:
    v5:
     - remove spaces after commas (Yann)
    v4:
     - split this patch from the patch set to send to muster as bugfix
    v2:
     - remove spurious space at the beginning of the QUIET variable (Arnout)
    
    v4:
     - split this patch from the patch set to send to muster as bugfix
    v2:
     - remove spurious space at the beginning of the QUIET variable (Arnout)

 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3baa709..e94df7a 100644
--- a/Makefile
+++ b/Makefile
@@ -303,7 +303,7 @@ GNU_HOST_NAME := $(shell support/gnuconfig/config.guess)
 TARGETS :=
 
 # silent mode requested?
-BR_QUIET := $(if $(findstring s,$(MAKEFLAGS)),-q)
+BR_QUIET := $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),-q)
 
 # Strip off the annoying quoting
 ARCH := $(call qstrip,$(BR2_ARCH))
-- 
2.2.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 3/4] support/download: silence svn if it is a silent build
  2014-12-23  8:54 [Buildroot] [PATCH v5 0/4] Improve silent builds Fabio Porcedda
  2014-12-23  8:54 ` [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance Fabio Porcedda
  2014-12-23  8:54 ` [Buildroot] [PATCH v5 2/4] Makefile: improve detection of make "-s" flag Fabio Porcedda
@ 2014-12-23  8:55 ` Fabio Porcedda
  2014-12-23  8:55 ` [Buildroot] [PATCH v5 4/4] support/download: silence git " Fabio Porcedda
  3 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-23  8:55 UTC (permalink / raw)
  To: buildroot

If it is a silent build (make -s -> BR_QUIET=-q) silence the svn
download helper using "svn -q" just like others download helpers,
e.g. wget.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---

Notes:
    v5:
    - use getopts
    v4:
    - instead of changing the "SVN" variable pass the "-q" option to the
      download helper (Thomas P.)
    v3:
     - add this patch

 package/pkg-download.mk     |  1 +
 support/download/dl-wrapper | 11 ++++++++---
 support/download/svn        | 17 ++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index 884daff..a773597 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -147,6 +147,7 @@ define DOWNLOAD_SVN
 	$(EXTRA_ENV) $(DL_WRAPPER) -b svn \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
 		-H $(PKGDIR)/$($(PKG)_RAWNAME).hash \
+		$(BR_QUIET) \
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper
index cced8f6..7cd8606 100755
--- a/support/download/dl-wrapper
+++ b/support/download/dl-wrapper
@@ -21,15 +21,16 @@ set -e
 
 main() {
     local OPT OPTARG
-    local backend output hfile
+    local backend output hfile quiet
 
     # Parse our options; anything after '--' is for the backend
-    while getopts :hb:o:H: OPT; do
+    while getopts :hb:o:H:q OPT; do
         case "${OPT}" in
         h)  help; exit 0;;
         b)  backend="${OPTARG}";;
         o)  output="${OPTARG}";;
         H)  hfile="${OPTARG}";;
+        q)  quiet="-q";;
         :)  error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
         \?) error "unknown option '%s'\n" "${OPTARG}";;
         esac
@@ -47,6 +48,10 @@ main() {
         error "no hash-file specified, use -H\n"
     fi
 
+    if [ "${backend}" != "svn" ]; then
+	quiet=
+    fi
+
     # If the output file already exists, do not download it again
     if [ -e "${output}" ]; then
         if support/download/check-hash "${hfile}" "${output}" "${output##*/}"; then
@@ -75,7 +80,7 @@ main() {
     # If the backend fails, we can just remove the temporary directory to
     # remove all the cruft it may have left behind. Then we just exit in
     # error too.
-    if ! "${OLDPWD}/support/download/${backend}" "${tmpf}" "${@}"; then
+    if ! "${OLDPWD}/support/download/${backend}" ${quiet} "${tmpf}" "${@}"; then
         rm -rf "${tmpd}"
         exit 1
     fi
diff --git a/support/download/svn b/support/download/svn
index a960f7d..90470dd 100755
--- a/support/download/svn
+++ b/support/download/svn
@@ -4,6 +4,8 @@
 set -e
 
 # Download helper for svn, to be called from the download wrapper script
+# Optional arguments:
+#   "-q": quiet flag
 # Expected arguments:
 #   $1: output file
 #   $2: svn repo
@@ -12,11 +14,24 @@ set -e
 # And this environment:
 #   SVN      : the svn command to call
 
+quiet=
+while getopts "q" opt; do
+    case $opt in
+	q)
+	    quiet=-q
+	    ;;
+	\?)
+	    exit 1
+	    ;;
+    esac
+done
+shift $((OPTIND-1))
+
 output="${1}"
 repo="${2}"
 rev="${3}"
 basename="${4}"
 
-${SVN} export "${repo}@${rev}" "${basename}"
+${SVN} ${quiet} export "${repo}@${rev}" "${basename}"
 
 tar czf "${output}" "${basename}"
-- 
2.2.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [Buildroot] [PATCH v5 4/4] support/download: silence git if it is a silent build
  2014-12-23  8:54 [Buildroot] [PATCH v5 0/4] Improve silent builds Fabio Porcedda
                   ` (2 preceding siblings ...)
  2014-12-23  8:55 ` [Buildroot] [PATCH v5 3/4] support/download: silence svn if it is a silent build Fabio Porcedda
@ 2014-12-23  8:55 ` Fabio Porcedda
  3 siblings, 0 replies; 11+ messages in thread
From: Fabio Porcedda @ 2014-12-23  8:55 UTC (permalink / raw)
  To: buildroot

If it is a silent build (make -s -> BR_QUIET=-q) silence the git
download helper using "git clone -q" just like others download helpers,
e.g. wget.

Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
---

Notes:
    v5:
     - use getopts
    v3:
     - add this patch

 package/pkg-download.mk     |  1 +
 support/download/dl-wrapper |  2 +-
 support/download/git        | 27 +++++++++++++++++++++++----
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/package/pkg-download.mk b/package/pkg-download.mk
index a773597..e7bac2d 100644
--- a/package/pkg-download.mk
+++ b/package/pkg-download.mk
@@ -88,6 +88,7 @@ define DOWNLOAD_GIT
 	$(EXTRA_ENV) $(DL_WRAPPER) -b git \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
 		-H $(PKGDIR)/$($(PKG)_RAWNAME).hash \
+		$(BR_QUIET) \
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
diff --git a/support/download/dl-wrapper b/support/download/dl-wrapper
index 7cd8606..e84a757 100755
--- a/support/download/dl-wrapper
+++ b/support/download/dl-wrapper
@@ -48,7 +48,7 @@ main() {
         error "no hash-file specified, use -H\n"
     fi
 
-    if [ "${backend}" != "svn" ]; then
+    if [ ! \( "${backend}" == "git" -o "${backend}" == "svn" \) ]; then
 	quiet=
     fi
 
diff --git a/support/download/git b/support/download/git
index 5d36ca4..b6ebfdc 100755
--- a/support/download/git
+++ b/support/download/git
@@ -4,6 +4,8 @@
 set -e
 
 # Download helper for git, to be called from the download wrapper script
+# Optional arguments:
+#   "-q": quiet flag
 # Expected arguments:
 #   $1: output file
 #   $2: git repo
@@ -12,6 +14,19 @@ set -e
 # And this environment:
 #   GIT      : the git command to call
 
+quiet=
+while getopts "q" opt; do
+    case $opt in
+	q)
+	    quiet=-q
+	    ;;
+	\?)
+	    exit 1
+	    ;;
+    esac
+done
+shift $((OPTIND-1))
+
 output="${1}"
 repo="${2}"
 cset="${3}"
@@ -21,16 +36,20 @@ basename="${4}"
 # than a full clone.
 git_done=0
 if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then
-    printf "Doing shallow clone\n"
-    if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${basename}"; then
+    if [ -z "${quiet}" ]; then
+	printf "Doing shallow clone\n";
+    fi
+    if ${GIT} clone ${quiet} --depth 1 -b "${cset}" --bare "${repo}" "${basename}"; then
         git_done=1
     else
         printf "Shallow clone failed, falling back to doing a full clone\n"
     fi
 fi
 if [ ${git_done} -eq 0 ]; then
-    printf "Doing full clone\n"
-    ${GIT} clone --bare "${repo}" "${basename}"
+    if [ -z "${quiet}" ]; then
+	printf "Doing full clone\n";
+    fi
+    ${GIT} clone ${quiet} --bare "${repo}" "${basename}"
 fi
 
 GIT_DIR="${basename}" \
-- 
2.2.1

^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2014-12-30 11:43 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-23  8:54 [Buildroot] [PATCH v5 0/4] Improve silent builds Fabio Porcedda
2014-12-23  8:54 ` [Buildroot] [PATCH v5 1/4] Rename the variable "QUIET" to "BR_QUIET" for conformance Fabio Porcedda
2014-12-23 10:17   ` Thomas Petazzoni
2014-12-23 10:51     ` Fabio Porcedda
2014-12-28 16:24       ` Fabio Porcedda
2014-12-28 21:57         ` Yann E. MORIN
2014-12-30 10:59           ` Fabio Porcedda
2014-12-30 11:43             ` Fabio Porcedda
2014-12-23  8:54 ` [Buildroot] [PATCH v5 2/4] Makefile: improve detection of make "-s" flag Fabio Porcedda
2014-12-23  8:55 ` [Buildroot] [PATCH v5 3/4] support/download: silence svn if it is a silent build Fabio Porcedda
2014-12-23  8:55 ` [Buildroot] [PATCH v5 4/4] support/download: silence git " Fabio Porcedda

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox