Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib/common If MAKEVERBOSE < 2 remove the -v from pax com...



details:   https://anonhg.NetBSD.org/src/rev/7016d48eb64f
branches:  trunk
changeset: 793472:7016d48eb64f
user:      dsl <dsl%NetBSD.org@localhost>
date:      Sat Feb 15 09:43:02 2014 +0000

description:
If MAKEVERBOSE < 2 remove the -v from pax command lines.

diffstat:

 distrib/common/Makefile.bootcd |  16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diffs (58 lines):

diff -r 9ea46ef0bd87 -r 7016d48eb64f distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Sat Feb 15 08:25:01 2014 +0000
+++ b/distrib/common/Makefile.bootcd    Sat Feb 15 09:43:02 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootcd,v 1.23 2014/01/16 01:15:32 christos Exp $
+#      $NetBSD: Makefile.bootcd,v 1.24 2014/02/15 09:43:02 dsl Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -116,6 +116,12 @@
 .endif
 .endif
 
+.if ${MAKEVERBOSE} >= 2
+PAX_v?= -v
+.else
+PAX_v?=
+.endif
+
 # Copy $RELEASEDIR/${MACHINE} in the CDROM dir
 #
 # XXX This could be done a lot easier if makefs(8) could
@@ -134,7 +140,7 @@
                cd ${RELEASEDIR}/${RELEASEMACHINEDIR};                  \
                echo Copying $$(pwd) to $$release_destdir ...;          \
                ${TOOL_PAX}                                             \
-                       -rw -pe -v                                      \
+                       -rw -pe ${PAX_v}                                \
                        ${CDRELEASE_EXCLUDE}                            \
                        . $$release_destdir;                            \
                cd $$curdir;                                            \
@@ -150,7 +156,7 @@
                cd ${RELEASEDIR}/source;                                \
                echo Copying $$(pwd) to $$release_destdir ...;          \
                ${TOOL_PAX}                                             \
-                       -rw -pe -v                                      \
+                       -rw -pe ${PAX_v}                                \
                        . $$release_destdir;                            \
                cd $$curdir;                                            \
        fi
@@ -161,7 +167,7 @@
                cd ${DESTDIR};                                          \
                for cde in ${CDRUNTIME};                                \
                do                                                      \
-                       ${TOOL_PAX} -rw -pp -v $${cde} $$release_destdir;\
+                       ${TOOL_PAX} -rw -pp ${PAX_v} $${cde} $$release_destdir;\
                done;                                                   \
                cd $$curdir;                                            \
        fi
@@ -189,7 +195,7 @@
                                cd $${cde};                             \
                                echo Copying $$(pwd) to $$release_destdir ...;  \
                                ${TOOL_MTREE} -c $${skipflag} |         \
-                                       ${TOOL_PAX} -rw -pe -v -M       \
+                                       ${TOOL_PAX} -rw -pe ${PAX_v} -M \
                                        $$release_destdir;              \
                        else                                            \
                                echo "Missing $${cde}, aborting";       \



Home | Main Index | Thread Index | Old Index