From d422eae9e88c342ff3dada9c0f2b475f7673a9bd Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Wed, 4 Jun 2003 05:17:18 +0000 Subject: [PATCH] Have the port readmes follow the same logic as buildworld. We skip doing make readmes if /tmp/.skip_ports exists. This file is created after a complete run, which avoids that we do the lengthy operation again for a rerelease. When NOPORTS or NOPORTREADMES are defined, we create the file prior to starting the release. --- release/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/release/Makefile b/release/Makefile index 1c19b8d48107..98eb409aa79d 100644 --- a/release/Makefile +++ b/release/Makefile @@ -453,14 +453,11 @@ release rerelease: echo " ${CROSSMAKE} ${WORLD_FLAGS} -DNOCLEAN buildworld && \\" >> ${CHROOTDIR}/mk echo " touch /tmp/.world_done" >> ${CHROOTDIR}/mk echo "fi" >> ${CHROOTDIR}/mk -.if defined(NOPORTS) || defined(NOPORTREADMES) - echo "if false; then" >> ${CHROOTDIR}/mk -.else - echo "if true; then" >> ${CHROOTDIR}/mk -.endif + echo "if [ ! -f /tmp/.skip_ports ]; then" >> ${CHROOTDIR}/mk echo " echo \">>> make readmes started on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk echo " cd /usr/ports" >> ${CHROOTDIR}/mk echo " make ${PORTREADMES_FLAGS} readmes" >> ${CHROOTDIR}/mk + echo " touch /tmp/.skip_ports" >> ${CHROOTDIR}/mk echo " echo \">>> make readmes finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk echo "fi" >> ${CHROOTDIR}/mk echo "cd /usr/src/release" >> ${CHROOTDIR}/mk @@ -468,6 +465,9 @@ release rerelease: echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk chmod 755 ${CHROOTDIR}/mk +.if defined(NOPORTS) || defined(NOPORTREADMES) + touch ${CHROOTDIR}/tmp/.skip_ports +.endif # Ensure md.ko is loaded if md(4) is not statically compiled into the kernel -mdconfig 2>/dev/null env -i /usr/sbin/chroot ${CHROOTDIR} /mk