From owner-svn-src-stable@FreeBSD.ORG Wed Jun 26 00:38:40 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D95556FF; Wed, 26 Jun 2013 00:38:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id CBD0B1E5C; Wed, 26 Jun 2013 00:38:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5Q0cewU015872; Wed, 26 Jun 2013 00:38:40 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5Q0ceNm015870; Wed, 26 Jun 2013 00:38:40 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201306260038.r5Q0ceNm015870@svn.freebsd.org> From: Glen Barber Date: Wed, 26 Jun 2013 00:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r252224 - stable/9/release X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Jun 2013 00:38:40 -0000 Author: gjb Date: Wed Jun 26 00:38:40 2013 New Revision: 252224 URL: http://svnweb.freebsd.org/changeset/base/252224 Log: MFC r251652, r251811, r252101: r251652: Add new script to run release builds. The script is heavily based upon the release/generate-release.sh script by nwhitehorn. This script can use optional configuration file to override defaults, making running multiple serialzied builds with different specific configurations or architecture-specific tunings quite easy. Sample overrideable options are included in the release.conf.sample file. r251811: Fix OSVERSION variable within PBUILD_FLAGS. r252101: If MAKE_CONF and/or SRC_CONF are set and not character devices, copy to chroot to use with release build. Approved by: kib (mentor, implicit) Added: stable/9/release/release.conf.sample - copied unchanged from r251652, head/release/release.conf.sample stable/9/release/release.sh - copied, changed from r251652, head/release/release.sh Modified: Directory Properties: stable/9/release/ (props changed) Copied: stable/9/release/release.conf.sample (from r251652, head/release/release.conf.sample) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/release/release.conf.sample Wed Jun 26 00:38:40 2013 (r252224, copy of r251652, head/release/release.conf.sample) @@ -0,0 +1,41 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +## Set the directory within which the release will be built. +CHROOTDIR="/scratch" + +## Set the svn host. +SVNROOT="svn://svn.FreeBSD.org" + +## Set the src/, ports/, and doc/ branches or tags. +SRCBRANCH="base/head" +DOCBRANCH="doc/head" +PORTBRANCH="ports/head" + +## Set the src/, ports/, and doc/ revisions. +SRCREVISION="-rHEAD" +DOCREVISION="-rHEAD" +PORTREVISION="-rHEAD" + +## Set to override the default target architecture. +#TARGET="amd64" +#TARGET_ARCH="amd64" +#KERNEL="GENERIC" + +## Set to specify a custom make.conf and/or src.conf +#MAKE_CONF="/etc/local/make.conf" +#SRC_CONF="/etc/local/src.conf" + +## Set to use make(1) flags. +#MAKE_FLAGS="-s" + +## Set to use world- and kernel-specific make(1) flags. +#WORLD_FLAGS="-j $(sysctl -n hw.ncpu)" +#KERNEL_FLAGS="-j $(expr $(sysctl -n hw.ncpu) / 2)" + +## Set miscellaneous 'make release' settings. +#NODOC= +#NOPORTS= +#RELSTRING= Copied and modified: stable/9/release/release.sh (from r251652, head/release/release.sh) ============================================================================== --- head/release/release.sh Wed Jun 12 13:15:28 2013 (r251652, copy source) +++ stable/9/release/release.sh Wed Jun 26 00:38:40 2013 (r252224) @@ -165,12 +165,23 @@ build_doc_ports() { ## Trick the ports 'run-autotools-fixup' target to do the right thing. _OSVERSION=$(sysctl -n kern.osreldate) if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" != "x" ]; then - PBUILD_FLAGS="OSVERSION=${OSVERSION} WITHOUT_JADETEX=yes BATCH=yes" + PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes BATCH=yes" chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \ ${PBUILD_FLAGS} install fi } +# If MAKE_CONF and/or SRC_CONF are set and not character devices (/dev/null), +# copy them to the chroot. +if [ -e ${MAKE_CONF} ] && [ ! -c ${MAKE_CONF} ]; then + mkdir -p ${CHROOTDIR}/$(dirname ${MAKE_CONF}) + cp ${MAKE_CONF} ${CHROOTDIR}/${MAKE_CONF} +fi +if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then + mkdir -p ${CHROOTDIR}/$(dirname ${SRC_CONF}) + cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF} +fi + if [ -d ${CHROOTDIR}/usr/ports ]; then cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf build_doc_ports ${CHROOTDIR}