aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2019-09-17 15:15:21 +0000
committerGlen Barber <gjb@FreeBSD.org>2019-09-17 15:15:21 +0000
commit26754d9570d9275fb566c3c5079b27a33413bf8f (patch)
treec55b6dac43d0efa47dcf25fae6713039579ecec6
parentf6edf79f925f7eda80116191851d0e222a6238a4 (diff)
downloaddoc-26754d9570d9275fb566c3c5079b27a33413bf8f.tar.gz
doc-26754d9570d9275fb566c3c5079b27a33413bf8f.zip
- 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)
Notes
Notes: svn path=/head/; revision=53413
-rw-r--r--en_US.ISO8859-1/htdocs/releases/12.1R/Makefile20
-rw-r--r--en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware9
2 files changed, 15 insertions, 14 deletions
diff --git a/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile b/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile
index ed63d80441..51b46813b5 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile
+++ b/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile
@@ -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*
diff --git a/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware b/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware
index 69d395ecce..b2d134a48a 100644
--- a/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware
+++ b/en_US.ISO8859-1/htdocs/releases/12.1R/Makefile.hardware
@@ -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