From owner-svn-src-stable@FreeBSD.ORG Thu Jun 27 13:03:20 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 18BC5F6; Thu, 27 Jun 2013 13:03:20 +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 09ADD126D; Thu, 27 Jun 2013 13:03:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RD3JjN042031; Thu, 27 Jun 2013 13:03:19 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RD3JgO042024; Thu, 27 Jun 2013 13:03:19 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201306271303.r5RD3JgO042024@svn.freebsd.org> From: Glen Barber Date: Thu, 27 Jun 2013 13:03:19 +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: r252305 - in stable/9: . release/doc share/man/man5 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: Thu, 27 Jun 2013 13:03:20 -0000 Author: gjb Date: Thu Jun 27 13:03:19 2013 New Revision: 252305 URL: http://svnweb.freebsd.org/changeset/base/252305 Log: MFC r230786, r246283, r251084, r251085, r251086: r230786 (imp): - Allow specification of build shell for the buildenv target. r246283 (hrs) (partial): - Add {WORLD,KERNEL}_FLAGS to [BTWK]MAKE. r251084: - r245757 introduced warning output if update method is set to CVS_UPDATE or SUP_UPDATE. - CVS exporter for stable/9/ is turned off for nearly one month now. - It is finally time to swing the ax at these update methods. r251085: - Fix typo introduced in r251084. r251086: - Remove references to CVS_UPDATE and SUP_UPDATE to catch up with r251084. Approved by: kib (mentor) Modified: stable/9/Makefile.inc1 (contents, props changed) stable/9/release/doc/Makefile stable/9/share/man/man5/make.conf.5 Directory Properties: stable/9/release/doc/ (props changed) stable/9/share/man/man5/ (props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Thu Jun 27 10:58:31 2013 (r252304) +++ stable/9/Makefile.inc1 Thu Jun 27 13:03:19 2013 (r252305) @@ -23,6 +23,9 @@ # when NO_ROOT is set. (default: ${DESTDIR}/METALOG) # TARGET="machine" to crossbuild world for a different machine type # TARGET_ARCH= may be required when a TARGET supports multiple endians +# BUILDENV_SHELL= shell to launch for the buildenv target (def:/bin/sh) +# WORLD_FLAGS= additional flags to pass to make(1) during buildworld +# KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel # # The intended user-driven targets are: @@ -111,15 +114,10 @@ CLEANDIR= clean cleandepend CLEANDIR= cleandir .endif -CVS?= cvs -CVSFLAGS?= -A -P -d -I! -SVN?= svn +BUILDENV_SHELL?=/bin/sh + +SVN?= /usr/local/bin/svn SVNFLAGS?= -r HEAD -SUP?= /usr/bin/csup -SUPFLAGS?= -g -L 2 -.if defined(SUPHOST) -SUPFLAGS+= -h ${SUPHOST} -.endif MAKEOBJDIRPREFIX?= /usr/obj .if !defined(OSRELDATE) @@ -240,7 +238,7 @@ BMAKEENV= INSTALL="sh ${.CURDIR}/tools/i MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ COMPILER_TYPE=${COMPILER_TYPE} BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ - ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ @@ -250,7 +248,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ - ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ + ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ DESTDIR= \ BOOTSTRAPPING=${OSRELDATE} \ @@ -283,7 +281,7 @@ WMAKE_COMPILER_TYPE= gcc WMAKE_COMPILER_TYPE= clang .endif WMAKEENV+= COMPILER_TYPE=${WMAKE_COMPILER_TYPE} -WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} +WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP} .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64" # 32 bit world @@ -373,7 +371,7 @@ IMAKE_MTREE= MTREE_CMD="nmtree ${MTREEFL # kernel stage KMAKEENV= ${WMAKEENV} -KMAKE= ${KMAKEENV} ${MAKE} KERNEL=${INSTKERNNAME} +KMAKE= ${KMAKEENV} ${MAKE} ${KERNEL_FLAGS} KERNEL=${INSTKERNNAME} # # buildworld @@ -602,7 +600,7 @@ buildenvvars: buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} sh || true + @cd ${.CURDIR} && env ${WMAKEENV} ${BUILDENV_SHELL} || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -1014,59 +1012,18 @@ doxygen: # latest copy. # update: -.if defined(SUP_UPDATE) +.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE) @echo "--------------------------------------------------------------" - @echo ">>> Running ${SUP}" + @echo "CVS_UPDATE and SUP_UPDATE are no longer supported." + @echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated" @echo "--------------------------------------------------------------" - @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" - @echo "!! Update methods with ${SUP} are deprecated." - @echo "!! Please see http://www.freebsd.org/handbook/svn.html" - @echo "!! and convert your update method to SVN_UPDATE or" - @echo "!! freebsd-update(8)." - @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" - @sleep 5 -.if defined(SUPFILE) - @${SUP} ${SUPFLAGS} ${SUPFILE} -.endif -.if defined(SUPFILE1) - @${SUP} ${SUPFLAGS} ${SUPFILE1} -.endif -.if defined(SUPFILE2) - @${SUP} ${SUPFLAGS} ${SUPFILE2} -.endif -.if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE) - @${SUP} ${SUPFLAGS} ${PORTSSUPFILE} -.endif -.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE) - @${SUP} ${SUPFLAGS} ${DOCSUPFILE} -.endif -.endif -.if defined(CVS_UPDATE) - @cd ${.CURDIR} ; \ - if [ -d CVS ] ; then \ - echo "--------------------------------------------------------------" ; \ - echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ - echo "--------------------------------------------------------------" ; \ - echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ - echo "!! Update methods with CVS are deprecated." ; \ - echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \ - echo "!! and convert your update method to SVN_UPDATE or" ; \ - echo "!! freebsd-update(8)." ; \ - echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ - sleep 5 ; \ - echo ${CVS} -R -q update ${CVSFLAGS} ; \ - ${CVS} -R -q update ${CVSFLAGS} ; \ - fi + @exit 1 .endif .if defined(SVN_UPDATE) - @cd ${.CURDIR} ; \ - if [ -d .svn ] ; then \ - echo "--------------------------------------------------------------" ; \ - echo ">>> Updating ${.CURDIR} using Subversion" ; \ - echo "--------------------------------------------------------------" ; \ - echo ${SVN} update ${SVNFLAGS} ; \ - ${SVN} update ${SVNFLAGS} ; \ - fi + @echo "--------------------------------------------------------------" + @echo ">>> Updating ${.CURDIR} using Subversion" + @echo "--------------------------------------------------------------" + @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS}) .endif # Modified: stable/9/release/doc/Makefile ============================================================================== --- stable/9/release/doc/Makefile Thu Jun 27 10:58:31 2013 (r252304) +++ stable/9/release/doc/Makefile Thu Jun 27 13:03:19 2013 (r252305) @@ -12,26 +12,30 @@ SUBDIR+= share/xml RELN_ROOT?= ${.CURDIR} -.if defined(SUPHOST) -SUPFLAGS+= -h ${SUPHOST} -.endif +SVN?= /usr/local/bin/svn +SVNFLAGS?= -r HEAD + update: -.if defined(SUP_UPDATE) -.if !defined(DOCSUPFILE) - @echo "Error: Please define DOCSUPFILE before doing make update." +.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE) + @echo "--------------------------------------------------------------" + @echo "CVS_UPDATE and SUP_UPDATE are no longer supported." + @echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated" + @echo "--------------------------------------------------------------" @exit 1 .endif +.if defined(SVN_UPDATE) +. if !exists(${SVN}) @echo "--------------------------------------------------------------" - @echo ">>> Running ${SUP}" + @echo ">>> Updating ${RELN_ROOT} requires ${SVN}." @echo "--------------------------------------------------------------" - @${SUP} ${SUPFLAGS} ${DOCSUPFILE} -.elif defined(CVS_UPDATE) + @exit 1 +. endif @echo "--------------------------------------------------------------" - @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT} + @echo ">>> Updating ${.CURDIR} using Subversion" @echo "--------------------------------------------------------------" - cd ${.CURDIR}; cvs -q update -P -d + @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS}) .else - @echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first." + @echo "Error: Please define SVN_UPDATE first." .endif .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" Modified: stable/9/share/man/man5/make.conf.5 ============================================================================== --- stable/9/share/man/man5/make.conf.5 Thu Jun 27 10:58:31 2013 (r252304) +++ stable/9/share/man/man5/make.conf.5 Thu Jun 27 13:03:19 2013 (r252305) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 26, 2013 +.Dd May 28, 2013 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -177,16 +177,6 @@ Refer to for a list of recognized .Va CPUTYPE options. -.It Va CVS_UPDATE -.Pq Vt bool -Set this to use -.Xr cvs 1 -to update your -.Pa src , ports -and -.Pa doc -trees with -.Dq Li "make update" . .It Va CXXFLAGS .Pq Vt str Controls the compiler settings when compiling C++ code. @@ -255,61 +245,6 @@ Set this to not update the doc tree duri .Pq Vt bool Set this to not update the ports tree during .Dq Li "make update" . -.It Va SUP -.Pq Vt str -The location of the -.Xr csup 1 -or -.Xr cvsup 1 -command for -.Dq Li "make update" . -.It Va SUPFILE -.Pq Vt str -The first -.Ar supfile -to use when doing a -.Dq Li "make update" . -For example, -.Pa /usr/share/examples/cvsup/standard-supfile . -.It Va SUPFILE1 -.Pq Vt str -The second -.Ar supfile -to use when doing a -.Dq Li "make update" . -.It Va SUPFILE2 -.Pq Vt str -The third -.Ar supfile -to use when doing a -.Dq Li "make update" . -.It Va SUPFLAGS -.Pq Vt str -The flag for the -.Xr sup 1 -command when doing -.Dq Li "make update" . -This defaults to -.Op Fl g L Ar 2 . -.It Va SUPHOST -.Pq Vt str -The hostname of the sup server to use when doing -.Dq Li "make update" . -.It Va SUP_UPDATE -.Pq Vt bool -Set this to use -.Xr csup 1 -to update your -.Pa src , -and -.Pa ports -trees with -.Dq Li "make update" . -This option is deprecated. -Please use -.Va SVN_UPDATE -or -.Xr freebsd-update 8 . .It Va SVN_UPDATE .Pq Vt bool Set this to use