Index: head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile (revision 53412) +++ head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile (revision 53413) @@ -1,83 +1,83 @@ # $FreeBSD$ .if exists(../Makefile.conf) .include "../Makefile.conf" .endif .if exists(../Makefile.inc) .include "../Makefile.inc" .endif .if exists(Makefile.hardware) .include "Makefile.hardware" .endif RELN_ROOT?= ${.CURDIR} DOCS= index.xml \ schedule.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 _BIGIRON?= amd64 \ i386 \ powerpc \ powerpc-powerpc64 \ powerpc-powerpcspe \ sparc64 \ arm64-aarch64 _VMS?= amd64 \ i386 \ arm64-aarch64 _ARM_ARMV6?= RPI-B _ARM_ARMV7?= BANANAPI \ BEAGLEBONE \ CUBIEBOARD \ CUBIEBOARD2 \ CUBOX-HUMMINGBOARD \ GENERICSD \ PANDABOARD \ RPI2 \ WANDBOARD _ARM64_AARCH64?=PINE64 \ PINE64-LTS \ RPI3 # Do not look for checksums if BRANCH != RC* or RELEASE. # Special handling will be needed for cases where BRANCH # is RELEASE-pNN, for example, the 11.0-RELEASE really being # 11.0-RELEASE-p1. .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* .include "${DOC_PREFIX}/share/mk/web.site.mk" Index: head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware =================================================================== --- head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware (revision 53412) +++ head/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware (revision 53413) @@ -1,18 +1,19 @@ # $FreeBSD$ .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