Improve silent builds

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

Signed-off-by Fabio Porcedda <[email protected]>

---

Notes:
v3:
- add this patch

 package/pkg-download.mk |  3 ++-
 support/download/git    | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

package/pkg-download.mk +2 -1

index f3409bd..95175d6 100644
@@ -99,7 +99,8 @@ define DOWNLOAD_GIT
 		$(DL_DIR)/$($(PKG)_SOURCE) \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
-		$($(PKG)_BASE_NAME)
+		$($(PKG)_BASE_NAME) \
+		$(QUIET)
 endef
 
 # TODO: improve to check that the given PKG_DL_VERSION exists on the remote

support/download/git +0 -0

index 5d36ca4..4ce9030 100755

support/download/git +9 -4

 # And this environment:
 #   GIT      : the git command to call
 

@@ -16,21 +17,26 @@ output="${1}"
 repo="${2}"
 cset="${3}"
 basename="${4}"
+quiet="${5}"
 
 # Try to see if we can do a shallow clone, since it is faster
 # 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}" \

Signature · 1 line

2.1.3

I am not a big fan of this.

I would prefer we pass the quiet flag through the environment, something like this, for example:

Quoted 4 lines

I am not a big fan of this.

I would prefer we pass the quiet flag through the environment, something like this, for example:

On my side, I'm not a big fan of the environment, I find it a too hidden way to pass things.However, I find it a bit clunky to have this as a fifth optional argument.

The solution I would find the cleanest
would be to use real arguments for the download helper scripts, using getopt.

Like:

	git -o <output> -r <repo> -c <cset> -b <basename> [-q]

Well, the fact that we relied on the fact that -q is optional so had to be the fifth argument is what bothered me. If we were to be adding new optional flags, we'd be stuck. Passing them through the environment made it possible to add extra optional flags (although I wonder what those might be).

No need to recognise long options, though; shirt options are enough.

This patch set improves silent builds.

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

The change logs are in each patch.

Best regards
Fabio Porcedda (5):
support/download: silence git if it is a silent build support/download: silence svn if it is a silent build support/download: pass the quiet flag to the hg download helper support/download: pass the quiet flag to the wget download helper support/download: pass the quiet flag to the scp download helper

 package/pkg-download.mk | 21 +++++++++++++--------
 support/download/git    | 14 ++++++++++----
 support/download/hg     |  5 +++--
 support/download/scp    |  3 ++-
 support/download/svn    |  4 +++-
 support/download/wget   |  3 ++-
 6 files changed, 33 insertions(+), 17 deletions(-)

Hello Fabio,

Hello Fabio,

If you are interested to keep quiet builds, you may be interested by a tool called "reredirect"[1].

reredirect allows to redirect outputs of a running program. I use it to redirect output of make process (and its children) to log files (eg. build/busybox-1.22.1/busybox_extract.log, build/busybox-1.22.1/busybox_build.log, etc...).

To do this, I add this snippet in my local.mk :

define buildlog-silent

        $(call MESSAGE,$(2))
        if [ $(1) == start ]; then                                             \
                reredirect -m $(@D)/$(3)_$(2).log $$PPID > $(BUILD_DIR)/restore_$$PPID.cmd; \
        else                                                                   \
                sh $(BUILD_DIR)/restore_$$PPID.cmd;                            \
                rm $(BUILD_DIR)/restore_$$PPID.cmd;                            \
        fi

endef
GLOBAL_INSTRUMENTATION_HOOKS += buildlog-silent

With that, my build only display steps names and all build output is redirected to log files. I have also a more complex snippet to redirect output to log file and to console. In this case, I use a fifo and "tee" in add of "reredirect".

Note 1: You may have to disable ptrace_scope in order to make reredirect work:
echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope

[1] https://github.com/jerome-pouiller/reredirect

This patch set improves silent builds.

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

Fabio, All,

On 2014-11-24 14:56 +0100, Fabio Porcedda spake thusly:

Quoted 4 lines

This patch set improves silent builds.

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

Will you rework this series taking into account the comment Thomas and I made on your first patch?

In the meantime, I've marked your patches as "Changes Requested" in our Patchwork.

Quoted 5 lines

Fabio, All,

On 2014-11-24 14:56 +0100, Fabio Porcedda spake thusly:

Quoted 2 lines

This patch set improves silent builds.

Quoted 5 lines

Quoted 2 lines

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

Will you rework this series taking into account the comment Thomas and I made on your first patch?

Sure, i will do that when i have enough time to do that, right now i'm quite busy.

Fabio, All,

On 2014-12-07 22:54 +0100, Fabio Porcedda spake thusly:

Quoted 9 lines · Yann E. MORIN

Quoted 8 lines

Fabio, All,

On 2014-11-24 14:56 +0100, Fabio Porcedda spake thusly:

Quoted 4 lines

This patch set improves silent builds.

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

Quoted 5 lines

Quoted 2 lines

Will you rework this series taking into account the comment Thomas and I made on your first patch?

Sure, i will do that when i have enough time to do that, right now i'm quite busy.

No problem, thank you! :-)