From owner-freebsd-bugs@FreeBSD.ORG Mon Feb 21 22:20:11 2011 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1CD671065675 for ; Mon, 21 Feb 2011 22:20:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EC8358FC16 for ; Mon, 21 Feb 2011 22:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1LMKAnf095691 for ; Mon, 21 Feb 2011 22:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1LMKA3t095690; Mon, 21 Feb 2011 22:20:10 GMT (envelope-from gnats) Resent-Date: Mon, 21 Feb 2011 22:20:10 GMT Resent-Message-Id: <201102212220.p1LMKA3t095690@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Doug Barton Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C34D106564A for ; Mon, 21 Feb 2011 22:12:35 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 2FB6B8FC17 for ; Mon, 21 Feb 2011 22:12:35 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1LMCZ3H093815 for ; Mon, 21 Feb 2011 22:12:35 GMT (envelope-from dougb@freefall.freebsd.org) Received: (from dougb@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1LMCZKc093814; Mon, 21 Feb 2011 22:12:35 GMT (envelope-from dougb) Message-Id: <201102212212.p1LMCZKc093814@freefall.freebsd.org> Date: Mon, 21 Feb 2011 22:12:35 GMT From: Doug Barton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/154949: Small patch to release Makefile X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Doug Barton List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 22:20:11 -0000 >Number: 154949 >Category: bin >Synopsis: Small patch to release Makefile >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 21 22:20:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Doug Barton >Release: FreeBSD 8.1-STABLE i386 >Organization: AAAG >Environment: DNA >Description: When logging the build of a release the lines in this part of the Makefile get echo'ed to the log which makes it a bit confusing to simple minds like mine. :) There is no reason I can see not to mask these lines, so here you go. >How-To-Repeat: >Fix: Apply the following patch: Index: release/Makefile =================================================================== --- release/Makefile (revision 218688) +++ release/Makefile (working copy) @@ -550,45 +550,45 @@ .endif .endfor # Don't remove this, or the build will fall over! - echo "export RELEASEDIR=${_R}" >> ${_MK} - echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${_MK} - echo "export MANBUILDCAT=YES" >> ${_MK} + @echo "export RELEASEDIR=${_R}" >> ${_MK} + @echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${_MK} + @echo "export MANBUILDCAT=YES" >> ${_MK} # NB: these may fail if the host is running w/o devfs - echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} - echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK} - echo "if [ ! -c /dev/null ]; then" >> ${_MK} - echo " echo /dev/null is not a device!" >> ${_MK} - echo " exit 1" >> ${_MK} - echo "fi" >> ${_MK} - echo "if [ -x /etc/rc.d/ldconfig ]; then" >> ${_MK} - echo " /etc/rc.d/ldconfig start" >> ${_MK} - echo "else" >> ${_MK} - echo " ldconfig /lib /usr/lib /usr/local/lib || true" >> ${_MK} - echo "fi" >> ${_MK} - echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} - echo " cd /usr/src" >> ${_MK} - echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNO_CLEAN buildworld && \\" >> ${_MK} - echo " touch /tmp/.world_done || exit 1" >> ${_MK} - echo "fi" >> ${_MK} - echo "if [ ! -f /tmp/.skip_ports_index ]; then" >> ${_MK} - echo " echo \">>> make index started on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} - echo " for i in ${MAKEINDEXPORTS}" >> ${_MK} - echo " do" >> ${_MK} - echo " cd /usr/ports/\$${i}" >> ${_MK} - echo " env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK} - echo " make all install clean BATCH=yes FORCE_PKG_REGISTER=yes" >> ${_MK} - echo " done" >> ${_MK} - echo " cd /usr/ports" >> ${_MK} - echo " rm -f INDEX*" >> ${_MK} - echo " make index -DINDEX_PRISTINE" >> ${_MK} - echo " rm -f INDEX*.tmp" >> ${_MK} - echo " touch /tmp/.skip_ports_index" >> ${_MK} - echo " echo \">>> make index finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} - echo "fi" >> ${_MK} - echo "cd /usr/src/release" >> ${_MK} - echo "make obj" >> ${_MK} - echo "make \$${_RELTARGET}" >> ${_MK} - echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + @echo "umount /dev >/dev/null 2>&1 || true" >> ${_MK} + @echo "mount -t devfs devfs /dev >/dev/null 2>&1 || true" >> ${_MK} + @echo "if [ ! -c /dev/null ]; then" >> ${_MK} + @echo " echo /dev/null is not a device!" >> ${_MK} + @echo " exit 1" >> ${_MK} + @echo "fi" >> ${_MK} + @echo "if [ -x /etc/rc.d/ldconfig ]; then" >> ${_MK} + @echo " /etc/rc.d/ldconfig start" >> ${_MK} + @echo "else" >> ${_MK} + @echo " ldconfig /lib /usr/lib /usr/local/lib || true" >> ${_MK} + @echo "fi" >> ${_MK} + @echo "if [ ! -f /tmp/.world_done ]; then" >> ${_MK} + @echo " cd /usr/src" >> ${_MK} + @echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNO_CLEAN buildworld && \\" >> ${_MK} + @echo " touch /tmp/.world_done || exit 1" >> ${_MK} + @echo "fi" >> ${_MK} + @echo "if [ ! -f /tmp/.skip_ports_index ]; then" >> ${_MK} + @echo " echo \">>> make index started on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + @echo " for i in ${MAKEINDEXPORTS}" >> ${_MK} + @echo " do" >> ${_MK} + @echo " cd /usr/ports/\$${i}" >> ${_MK} + @echo " env -i HTTP_PROXY=$${HTTP_PROXY} FTP_PROXY=$${FTP_PROXY} FTP_PASSIVE_MODE=$${FTP_PASSIVE_MODE:-no} PATH=$${PATH} \\" >> ${_MK} + @echo " make all install clean BATCH=yes FORCE_PKG_REGISTER=yes" >> ${_MK} + @echo " done" >> ${_MK} + @echo " cd /usr/ports" >> ${_MK} + @echo " rm -f INDEX*" >> ${_MK} + @echo " make index -DINDEX_PRISTINE" >> ${_MK} + @echo " rm -f INDEX*.tmp" >> ${_MK} + @echo " touch /tmp/.skip_ports_index" >> ${_MK} + @echo " echo \">>> make index finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} + @echo "fi" >> ${_MK} + @echo "cd /usr/src/release" >> ${_MK} + @echo "make obj" >> ${_MK} + @echo "make \$${_RELTARGET}" >> ${_MK} + @echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK} chmod 755 ${_MK} .if defined(NOPORTS) touch ${CHROOTDIR}/tmp/.skip_ports_index >Release-Note: >Audit-Trail: >Unformatted: