aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-02-18 04:00:03 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-02-18 04:00:03 +0000
commitf61e92ca5a23450bc28169bbdd71d7674df98c19 (patch)
treea95489f5c037bbd7a85a70156b8734b4b5fb5868 /release/release.sh
parent4f4065e0a220a57afa03420d4f8fa97dbcb5644c (diff)
downloadsrc-f61e92ca5a23450bc28169bbdd71d7674df98c19.tar.gz
src-f61e92ca5a23450bc28169bbdd71d7674df98c19.zip
release: permanently remove the 'reldoc' target and associates
Following 7b1d1a1658ffb69eff93afc713f9e88ed8b20eac, the structure for the reldoc target has significantly changed as result of the ASCIIDoctor/Hugo migration. As the release notes related files on the installation medium are inherently out of date, purge them entirely. Discussed within: re, doceng No objection: re (silence), doceng (silence) Timeout: 2 weeks MFC after: 1 week MFC to: stable/13, stable/12, and stable/11 only Sponsored by: Rubicon Communications, LLC ("Netgate")
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh56
1 files changed, 6 insertions, 50 deletions
diff --git a/release/release.sh b/release/release.sh
index 58f946b9bba1..3d7612ef6b80 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -86,11 +86,9 @@ env_setup() {
# and ports/.
GITROOT="https://git.FreeBSD.org/"
SRCBRANCH="main"
- DOCBRANCH="main"
PORTBRANCH="head"
GITSRC="src.git"
GITPORTS="ports.git"
- GITDOC="doc.git"
# Set for embedded device builds.
EMBEDDEDBUILD=
@@ -112,8 +110,6 @@ env_setup() {
KERNEL="GENERIC"
# Set to non-empty value to disable checkout of doc/ and/or ports/.
- # Disabling ports/ checkout also forces NODOC to be set.
- NODOC=
NOPORTS=
# Set to non-empty value to disable distributing source tree.
@@ -145,14 +141,12 @@ env_check() {
# Prefix the branches with the GITROOT for the full checkout URL.
SRC="${GITROOT}${GITSRC}"
- DOC="${GITROOT}${GITDOC}"
#PORT="${GITROOT}${GITPORTS}"
PORT="svn://svn.freebsd.org/ports/"
if [ -n "${EMBEDDEDBUILD}" ]; then
WITH_DVD=
WITH_COMPRESSED_IMAGES=
- NODOC=yes
case ${EMBEDDED_TARGET}:${EMBEDDED_TARGET_ARCH} in
arm:arm*|arm64:aarch64|riscv:riscv64*)
chroot_build_release_cmd="chroot_arm_build_release"
@@ -162,26 +156,15 @@ env_check() {
esac
fi
- # If PORTS is set and NODOC is unset, force NODOC=yes because the ports
- # tree is required to build the documentation set.
- if [ -n "${NOPORTS}" ] && [ -z "${NODOC}" ]; then
- echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
- echo " and NOPORTS is set."
- NODOC=yes
- fi
-
- # If NOSRC, NOPORTS and/or NODOC are unset, they must not pass to make
+ # If NOSRC and/or NOPORTS are unset, they must not pass to make
# as variables. The release makefile verifies definedness of the
- # NOPORTS/NODOC variables instead of their values.
- SRCDOCPORTS=
+ # NOPORTS variable instead of its value.
+ SRCPORTS=
if [ -n "${NOPORTS}" ]; then
- SRCDOCPORTS="NOPORTS=yes"
- fi
- if [ -n "${NODOC}" ]; then
- SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NODOC=yes"
+ SRCPORTS="NOPORTS=yes"
fi
if [ -n "${NOSRC}" ]; then
- SRCDOCPORTS="${SRCDOCPORTS}${SRCDOCPORTS:+ }NOSRC=yes"
+ SRCPORTS="${SRCPORTS}${SRCPORTS:+ }NOSRC=yes"
fi
# The aggregated build-time flags based upon variables defined within
@@ -219,7 +202,7 @@ env_check() {
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} \
KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} \
- KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCDOCPORTS} \
+ KERNCONF=\"${KERNEL}\" ${CONF_FILES} ${SRCPORTS} \
WITH_DVD=${WITH_DVD} WITH_VMIMAGES=${WITH_VMIMAGES} \
WITH_CLOUDWARE=${WITH_CLOUDWARE} XZ_THREADS=${XZ_THREADS}"
@@ -238,13 +221,6 @@ chroot_setup() {
${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src
fi
fi
- if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
- if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then
- git -C ${CHROOTDIR}/usr/doc pull -q
- else
- ${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc
- fi
- fi
if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
# if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
# git -C ${CHROOTDIR}/usr/ports pull -q
@@ -326,26 +302,6 @@ extra_chroot_setup() {
pkg clean -y
fi
fi
- if [ -z "${NODOC}" ] && [ -d ${CHROOTDIR}/usr/ports ]; then
- # Trick the ports 'run-autotools-fixup' target to do the right
- # thing.
- _OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
- REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
- BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
- UNAME_r=${REVISION}-${BRANCH}
- if [ -d ${CHROOTDIR}/usr/doc ] && [ -z "${NODOC}" ]; then
- PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
- PBUILD_FLAGS="${PBUILD_FLAGS} UNAME_r=${UNAME_r}"
- PBUILD_FLAGS="${PBUILD_FLAGS} OSREL=${REVISION}"
- PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/ports"
- PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles"
- chroot ${CHROOTDIR} env ${PBUILD_FLAGS} \
- OPTIONS_UNSET="AVAHI FOP IGOR" make -C \
- /usr/ports/textproc/docproj \
- FORCE_PKG_REGISTER=1 \
- install clean distclean
- fi
- fi
if [ ! -z "${EMBEDDEDPORTS}" ]; then
_OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)