From owner-svn-src-user@freebsd.org Tue Jan 12 22:44:25 2016 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C177A6D43D for ; Tue, 12 Jan 2016 22:44:25 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE86E1B66; Tue, 12 Jan 2016 22:44:24 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CMiNsd099654; Tue, 12 Jan 2016 22:44:23 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CMiNeb099653; Tue, 12 Jan 2016 22:44:23 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201601122244.u0CMiNeb099653@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 12 Jan 2016 22:44:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r293784 - user/cperciva/freebsd-update-build/scripts X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2016 22:44:25 -0000 Author: glebius Date: Tue Jan 12 22:44:23 2016 New Revision: 293784 URL: https://svnweb.freebsd.org/changeset/base/293784 Log: - Instead of dumping patch(1) stdout to console, save it in $1-patch.log, like rest of the build stages do. - Report the patching stage with log(). Modified: user/cperciva/freebsd-update-build/scripts/build.subr Modified: user/cperciva/freebsd-update-build/scripts/build.subr ============================================================================== --- user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 20:53:57 2016 (r293783) +++ user/cperciva/freebsd-update-build/scripts/build.subr Tue Jan 12 22:44:23 2016 (r293784) @@ -409,7 +409,7 @@ applypatches () { echo ${file} fi done | xargs rm -f - done < $2 2> ${WORKDIR}/$1-patch.log + done < $2 > ${WORKDIR}/$1-patch.log 2>&1 cd - } @@ -446,6 +446,7 @@ patchworld () { # Apply patches, in order of increasing patch level. The # order matters in case we have multiple security advisories # affecting the same code. + log "Patching world+src" ls ${PATCHDIR} | sort -n > ${WORKDIR}/patchlist.tmp applypatches $1 ${WORKDIR}/patchlist.tmp