From owner-svn-src-user@FreeBSD.ORG Wed Oct 2 18:23:49 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 341C0FAF; Wed, 2 Oct 2013 18:23:49 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 203002F0A; Wed, 2 Oct 2013 18:23:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r92INmAa093316; Wed, 2 Oct 2013 18:23:48 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r92INlXR093288; Wed, 2 Oct 2013 18:23:47 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201310021823.r92INlXR093288@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Wed, 2 Oct 2013 18:23:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r256000 - user/des/tinderbox/etc 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.14 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: Wed, 02 Oct 2013 18:23:49 -0000 Author: des Date: Wed Oct 2 18:23:46 2013 New Revision: 256000 URL: http://svnweb.freebsd.org/changeset/base/256000 Log: Switch from %%FOO%% syntax to ${FOO} syntax. Modified: user/des/tinderbox/etc/default.rc user/des/tinderbox/etc/freebsd7-build.rc user/des/tinderbox/etc/freebsd7-update.rc user/des/tinderbox/etc/freebsd8-build.rc user/des/tinderbox/etc/freebsd8-update.rc user/des/tinderbox/etc/freebsd9-build.rc user/des/tinderbox/etc/freebsd9-update.rc user/des/tinderbox/etc/head-build.rc user/des/tinderbox/etc/head-update.rc Modified: user/des/tinderbox/etc/default.rc ============================================================================== --- user/des/tinderbox/etc/default.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/default.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -4,10 +4,10 @@ # $FreeBSD$ # -comment = %%branch%% tinderbox +comment = ${branch} tinderbox # Paths -sandbox = %%HOME%% +sandbox = ${HOME} # Tinderbox options options = --verbose @@ -16,6 +16,6 @@ targets = precleanobj, update, world, l # Reporting sender = FreeBSD Tinderbox -recipient = %%SENDER%% -subject = [%%COMMENT%%] failure on %%arch%%/%%machine%% +recipient = ${SENDER} +subject = [${COMMENT}] failure on ${arch}/${machine} urlbase = http://tinderbox.des.no/ Modified: user/des/tinderbox/etc/freebsd7-build.rc ============================================================================== --- user/des/tinderbox/etc/freebsd7-build.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/freebsd7-build.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -7,5 +7,5 @@ branches = RELENG_7 platforms = amd64, i386, i386/pc98, ia64, powerpc, sparc64 targets = precleanobj, version, world, lint, kernels, postcleanobj -srcdir = %%SANDBOX%%/%%BRANCH%%/src -recipient += , <%%arch%%@freebsd.org> +srcdir = ${SANDBOX}/${BRANCH}/src +recipient += , <${arch}@freebsd.org> Modified: user/des/tinderbox/etc/freebsd7-update.rc ============================================================================== --- user/des/tinderbox/etc/freebsd7-update.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/freebsd7-update.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -6,7 +6,7 @@ branches = RELENG_7 platforms = none -srcdir = %%SANDBOX%%/%%BRANCH%%/src +srcdir = ${SANDBOX}/${BRANCH}/src targets = update, version recipient += -subject = [%%COMMENT%%] source tree update failure +subject = [${COMMENT}] source tree update failure Modified: user/des/tinderbox/etc/freebsd8-build.rc ============================================================================== --- user/des/tinderbox/etc/freebsd8-build.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/freebsd8-build.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -7,5 +7,5 @@ branches = RELENG_8 platforms = amd64, arm, i386, i386/pc98, ia64, mips, powerpc, sparc64 targets = precleanobj, version, world, lint, kernels, postcleanobj -srcdir = %%SANDBOX%%/%%BRANCH%%/src -recipient += , <%%arch%%@freebsd.org> +srcdir = ${SANDBOX}/${BRANCH}/src +recipient += , <${arch}@freebsd.org> Modified: user/des/tinderbox/etc/freebsd8-update.rc ============================================================================== --- user/des/tinderbox/etc/freebsd8-update.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/freebsd8-update.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -6,7 +6,7 @@ branches = RELENG_8 platforms = none -srcdir = %%SANDBOX%%/%%BRANCH%%/src +srcdir = ${SANDBOX}/${BRANCH}/src targets = update, version recipient += -subject = [%%COMMENT%%] source tree update failure +subject = [${COMMENT}] source tree update failure Modified: user/des/tinderbox/etc/freebsd9-build.rc ============================================================================== --- user/des/tinderbox/etc/freebsd9-build.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/freebsd9-build.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -7,5 +7,5 @@ branches = RELENG_9, RELENG_9_2 platforms = amd64, arm, i386, i386/pc98, ia64, mips, powerpc, powerpc64/powerpc, sparc64 targets = precleanobj, version, world, lint, kernels, postcleanobj -srcdir = %%SANDBOX%%/%%BRANCH%%/src -recipient += , <%%arch%%@freebsd.org> +srcdir = ${SANDBOX}/${BRANCH}/src +recipient += , <${arch}@freebsd.org> Modified: user/des/tinderbox/etc/freebsd9-update.rc ============================================================================== --- user/des/tinderbox/etc/freebsd9-update.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/freebsd9-update.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -6,7 +6,7 @@ branches = RELENG_9, RELENG_9_2 platforms = none -srcdir = %%SANDBOX%%/%%BRANCH%%/src +srcdir = ${SANDBOX}/${BRANCH}/src targets = update, version recipient += -subject = [%%COMMENT%%] source tree update failure +subject = [${COMMENT}] source tree update failure Modified: user/des/tinderbox/etc/head-build.rc ============================================================================== --- user/des/tinderbox/etc/head-build.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/head-build.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -7,5 +7,5 @@ branches = HEAD platforms = amd64, arm, armv6/arm, i386, i386/pc98, ia64, mips, mips64/mips, powerpc, powerpc64/powerpc, sparc64 targets = precleanobj, version, world, lint, kernels, postcleanobj -srcdir = %%SANDBOX%%/%%BRANCH%%/src -recipient += , <%%arch%%@freebsd.org> +srcdir = ${SANDBOX}/${BRANCH}/src +recipient += , <${arch}@freebsd.org> Modified: user/des/tinderbox/etc/head-update.rc ============================================================================== --- user/des/tinderbox/etc/head-update.rc Wed Oct 2 18:22:42 2013 (r255999) +++ user/des/tinderbox/etc/head-update.rc Wed Oct 2 18:23:46 2013 (r256000) @@ -6,7 +6,7 @@ branches = HEAD platforms = none -srcdir = %%SANDBOX%%/%%BRANCH%%/src +srcdir = ${SANDBOX}/${BRANCH}/src targets = update, version recipient += -subject = [%%COMMENT%%] source tree update failure +subject = [${COMMENT}] source tree update failure