[src/trunk]: src sets: enhance MAKEVERBOSE support

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7369559e1063
branches:  trunk
changeset: 376323:7369559e1063
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Jun 10 16:08:41 2023 +0000

description:
sets: enhance MAKEVERBOSE support

Add more messages for various sets operations.
Add ${_MKMSG_CREATE} to bsd.own.mk.

Enhance maketars to be a bit more verbose even with -q,
to make it more obvious why certain operations may be slow.
May help debugging PR 47562.

diffstat:

 distrib/sets/Makefile |  12 ++++++++++--
 distrib/sets/maketars |   5 +++--
 share/mk/bsd.own.mk   |   3 ++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diffs (119 lines):

diff -r 3622a8d520db -r 7369559e1063 distrib/sets/Makefile
--- a/distrib/sets/Makefile     Sat Jun 10 14:11:08 2023 +0000
+++ b/distrib/sets/Makefile     Sat Jun 10 16:08:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.108 2022/08/21 07:10:03 lukem Exp $
+#      $NetBSD: Makefile,v 1.109 2023/06/10 16:08:41 lukem Exp $
 
 # Experimental RCS METALOG versioning
 # (Needs host's rcs(1) commands)
@@ -136,6 +136,7 @@ clean_METALOG: .PHONY
 METALOG.unpriv= -M ${METALOG}.sanitised
 sanitise_METALOG: .PHONY ${METALOG}.sanitised
 ${METALOG}.sanitised: ${METALOG}
+       ${_MKMSG_CREATE} METALOG.sanitised
        <${METALOG} \
            ${${MKUPDATE} != "no" :? ${METALOG_REMOVE_DUPLICATES} | :} \
            sort | ${TOOL_MTREE} -CSM -k all -R time -N ${NETBSDSRCDIR}/etc \
@@ -170,13 +171,16 @@ clean_METALOG: .PHONY ${METALOG}.sanitis
 
 # This target has debugging value only, really.
 makeflist: .PHONY .PRECIOUS check_DESTDIR
+       ${_MKMSG_EXECUTE} "makeflist"
        ${SETSCMD} ./makeflist ${MAKEFLIST_FLAGS}
 
 checkflist: .PRECIOUS .PHONY check_DESTDIR sanitise_METALOG
+       ${_MKMSG_EXECUTE} "checkflist"
        ${SETSCMD} ${.CURDIR}/checkflist \
            ${MAKEFLIST_FLAGS} ${CHECKFLIST_FLAGS} ${METALOG.unpriv}
 
 checkflist-x11: .PHONY check_DESTDIR
+       ${_MKMSG_EXECUTE} "checkflist -x"
        ${SETSCMD} ./checkflist -x ${CHECKFLIST_FLAGS}
 
 .if defined(DESTDIR) && ${DESTDIR} != ""
@@ -214,7 +218,7 @@ maketars: .PRECIOUS .PHONY check_DESTDIR
 
 maketarsetup: .EXEC
 .if defined(DESTDIR) && ${DESTDIR} != ""
-       ${_MKMSG} "execute  checkflist"
+       ${_MKMSG_EXECUTE} "checkflist"
        cd ${.CURDIR}; ${MAKE} checkflist
 .endif
        mkdir -p ${TARDIR}
@@ -268,6 +272,7 @@ installsets: .PHONY check_DESTDIR saniti
        @echo "setenv INSTALLDIR before doing that!"
        @false
 .endif
+       ${_MKMSG_EXECUTE} "maketars for installsets"
        ${SETSCMD} ./maketars -d ${DESTDIR:S,^$,/,} ${MAKETARS_FLAGS} \
            ${METALOG.unpriv} -N ${NETBSDSRCDIR}/etc \
            ${MAKEFLIST_FLAGS} -i ${INSTALLDIR} ${INSTALLSETS}
@@ -292,6 +297,7 @@ REGPKG.update:= ${MKUPDATE:tl:Nno:C/..*/
 SYSPKGSETS?= all
 makesyspkgs: .PHONY check_DESTDIR check_RELEASEDIR \
                sanitise_METALOG checkflist_if_DESTDIR
+       ${_MKMSG_EXECUTE} "regpkgset for makesyspkgs"
        mkdir -p ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
        ${SETSCMD} ${.CURDIR}/regpkgset \
            ${REGPKG.verbose} ${REGPKG.force} ${REGPKG.sloppy} \
@@ -301,12 +307,14 @@ makesyspkgs: .PHONY check_DESTDIR check_
            -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs ${SYSPKGSETS}
 
 makesyspkgsums: .PHONY check_RELEASEDIR
+       ${_MKMSG_CREATE} "syspkgs checksums"
        ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
 
 # Update the "deps" file.
 # XXX: Why is "deps" checked in to the source tree, instead of
 # just being created as necessary?
 makedeps: .PHONY
+       ${_MKMSG_CREATE} "syspkgs checksums"
        ${SETSCMD} ./syspkgdeps all >${.CURDIR}/deps
 
 # Sort the lists files.
diff -r 3622a8d520db -r 7369559e1063 distrib/sets/maketars
--- a/distrib/sets/maketars     Sat Jun 10 14:11:08 2023 +0000
+++ b/distrib/sets/maketars     Sat Jun 10 16:08:41 2023 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: maketars,v 1.95 2023/06/10 14:11:08 lukem Exp $
+# $NetBSD: maketars,v 1.96 2023/06/10 16:08:41 lukem Exp $
 #
 # Make release tar files for some or all lists.  Usage:
 # maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -173,6 +173,7 @@ trap cleanup 0 2 3 13               # EXIT INT QUIT P
 #
 
 for setname in ${lists}; do
+       msg "Creating flist.${setname}"
        ${HOST_SH} "${setsdir}/makeflist" -a "${MACHINE_ARCH}" -m "${MACHINE}" \
            -s "${setsdir}" "${setname}" > "${SDIR}/flist.${setname}" \
            || exit 1
@@ -180,7 +181,7 @@ for setname in ${lists}; do
                echo >&2 "makeflist output is empty for ${setname}"
                exit 1
        fi
-       ${setfilesonly} && msg "Creating ${setlistdir}/set.${setname}"
+       msg "Creating set.${setname}"
        if [ -n "${metalog}" ]; then
                ${AWK} -f "${rundir}/getdirs.awk" "${SDIR}/flist.${setname}" \
                    > "${SDIR}/flist.${setname}.full" \
diff -r 3622a8d520db -r 7369559e1063 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Jun 10 14:11:08 2023 +0000
+++ b/share/mk/bsd.own.mk       Sat Jun 10 16:08:41 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1341 2023/06/03 21:24:57 lukem Exp $
+#      $NetBSD: bsd.own.mk,v 1.1342 2023/06/10 16:08:41 lukem Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1796,6 +1796,7 @@ MAKEVERBOSE?=             2
 _MKMSG_BUILD?=         ${_MKMSG} "  build "
 _MKMSG_CREATE?=                ${_MKMSG} " create "
 _MKMSG_COMPILE?=       ${_MKMSG} "compile "
+_MKMSG_EXECUTE?=       ${_MKMSG} "execute "
 _MKMSG_FORMAT?=                ${_MKMSG} " format "
 _MKMSG_INSTALL?=       ${_MKMSG} "install "
 _MKMSG_LINK?=          ${_MKMSG} "   link "