aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-12-27 17:36:43 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-12-27 17:36:43 +0000
commit4eb970a44fead4f0d3810aee815f28f996ce390b (patch)
tree8d63e4eee5cef950961ff9ee403a71872c397710 /release/release.sh
parentfe20047039e662a46639108e7cfe79ce291c69bd (diff)
downloadsrc-4eb970a44fead4f0d3810aee815f28f996ce390b.tar.gz
src-4eb970a44fead4f0d3810aee815f28f996ce390b.zip
Move build_doc_ports() to the if...fi block from which it is called.
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=259955
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh28
1 files changed, 12 insertions, 16 deletions
diff --git a/release/release.sh b/release/release.sh
index 48a891abc32f..79419c4feb5e 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -173,21 +173,6 @@ mount -t devfs devfs ${CHROOTDIR}/dev
cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
-build_doc_ports() {
- # Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints
- # is created. This is needed by ports-mgmt/pkg.
- chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
-
- ## Trick the ports 'run-autotools-fixup' target to do the right thing.
- _OSVERSION=$(sysctl -n kern.osreldate)
- if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
- PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
- PBUILD_FLAGS="${PBUILD_FLAGS}"
- chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
- ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
- fi
-}
-
# If MAKE_CONF and/or SRC_CONF are set and not character devices (/dev/null),
# copy them to the chroot.
if [ -e ${MAKE_CONF} ] && [ ! -c ${MAKE_CONF} ]; then
@@ -200,7 +185,18 @@ if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
- build_doc_ports ${CHROOTDIR}
+ # Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints
+ # is created. This is needed by ports-mgmt/pkg.
+ chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
+
+ ## Trick the ports 'run-autotools-fixup' target to do the right thing.
+ _OSVERSION=$(sysctl -n kern.osreldate)
+ if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
+ PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+ PBUILD_FLAGS="${PBUILD_FLAGS}"
+ chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
+ ${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
+ fi
fi
if [ "x${RELSTRING}" = "x" ]; then