From owner-svn-doc-all@freebsd.org Tue Sep 17 15:15:22 2019 Return-Path: Delivered-To: svn-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CE331268D9; Tue, 17 Sep 2019 15:15:22 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46XmrV0RZ2z47RL; Tue, 17 Sep 2019 15:15:22 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6782A464; Tue, 17 Sep 2019 15:15:21 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8HFFLXR031187; Tue, 17 Sep 2019 15:15:21 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8HFFLaC031186; Tue, 17 Sep 2019 15:15:21 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201909171515.x8HFFLaC031186@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 17 Sep 2019 15:15:21 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r53413 - head/en_US.ISO8859-1/htdocs/releases/12.1R X-SVN-Group: doc-head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/en_US.ISO8859-1/htdocs/releases/12.1R X-SVN-Commit-Revision: 53413 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Sep 2019 15:15:22 -0000 Author: gjb Date: Tue Sep 17 15:15:21 2019 New Revision: 53413 URL: https://svnweb.freebsd.org/changeset/doc/53413 Log: - Connect the errata, hardware, and readme pages for 12.1 to the build. - Comment the checksum file names. - Bump _REVMINOR and _BRANCH. - Rework the _BRANCH evaluation used to determine from where to check out the share/man/man4 directory for manual pages to use releng/X.Y for BETA, in addition to RC and RELEASE builds. Sponsored by: Rubicon Communications, LLC (Netgate) Modified: head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware Modified: head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile Tue Sep 17 14:29:42 2019 (r53412) +++ head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile Tue Sep 17 15:15:21 2019 (r53413) @@ -17,14 +17,14 @@ DOCS= index.xml \ DATA= docbook.css -#SUBDIR= errata -#SUBDIR+= readme +SUBDIR= errata +SUBDIR+= readme SUBDIR+= relnotes #SUBDIR+= installation -#.if exists(${SVN}) -#SUBDIR+=hardware -#.endif +.if exists(${SVN}) +SUBDIR+=hardware +.endif # PGP-signed checksums @@ -63,19 +63,19 @@ _ARM64_AARCH64?=PINE64 \ .if (${_BRANCH:MRC*} != "" || ${_BRANCH:MRELEASE} != "") .for CHECKSUM in SHA512 SHA256 . for _B in ${_BIGIRON} -DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_B}.asc +#DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_B}.asc . endfor . for _V in ${_VMS} -DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_V}-vm.asc +#DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-${_V}-vm.asc . endfor . for _A in ${_ARM_ARMV6} -DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-armv6-${_A}.asc +#DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-armv6-${_A}.asc . endfor . for _A in ${_ARM_ARMV7} -DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-armv7-${_A}.asc +#DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm-armv7-${_A}.asc . endfor . for _A in ${_ARM64_AARCH64} -DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm64-aarch64-${_A}.asc +#DATA+= CHECKSUM.${CHECKSUM}-${THISRELEASE}-arm64-aarch64-${_A}.asc . endfor .endfor .endif # _BRANCH !RC* || RELEASE* Modified: head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware ============================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware Tue Sep 17 14:29:42 2019 (r53412) +++ head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware Tue Sep 17 15:15:21 2019 (r53413) @@ -3,16 +3,17 @@ .include "${DOC_PREFIX}/share/mk/doc.commands.mk" _OS?= FreeBSD _REVMAJOR?= 12 -_REVMINOR?= 0 +_REVMINOR?= 1 _REVISION?= ${_REVMAJOR}.${_REVMINOR} -_BRANCH?= STABLE +_BRANCH?= PRERELEASE THISRELEASE?= ${_OS}-${_REVISION}-${_BRANCH} HOSTNAME!= hostname .if (${_BRANCH:MCURRENT*} != "" || ${_BRANCH:MALPHA*} != "") SRCBRANCH= head -.elif (${_BRANCH:MPRERELEASE} != "" || ${_BRANCH:MBETA*} != "" || ${_BRANCH:MSTABLE*} != "") +.elif (${_BRANCH:MPRERELEASE} != "" || ${_BRANCH:MSTABLE*} != "") SRCBRANCH= stable/${_REVMAJOR} -.elif (${_BRANCH:MRC*} != "" || ${_BRANCH:MRELEASE*} != "") +.elif (${_BRANCH:MBETA*} != "" || ${_BRANCH:MRC*} != "" || \ + ${_BRANCH:MRELEASE*} != "") SRCBRANCH= releng/${_REVMAJOR}.${_REVMINOR} .endif