d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we are told to update the sources in "make rerelease", we also

Browse Source 
probably want to re-buildworld.

If we are not going to rebuild (make rerelease -DRELEASENOUPDATE
and the file ${CHROOTDIR}/tmp/.world_done exists), do not touch
${CHROOTDIR}/usr/src/sys/conf/newvers.sh, as the only effect that
is has is upsetting release.2.  Hey, have you ever seen this
"touch: not found" during rerelease?  :-)
This commit is contained in:
Ruslan Ermilov 2003-02-26 15:32:12 +00:00
parent 09e192903c
commit b4f721685e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
release/Makefile
View File

@ -398,6 +398,7 @@ release rerelease:
.else
cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d -r ${RELEASETAG}
.endif
rm -f ${CHROOTDIR}/tmp/.world_done
.if !defined(NOPORTS)
cd ${CHROOTDIR}/usr/ports && ${CVSPREFIX} cvs -R ${CVSARGS} -q update ${CVSCMDARGS} -P -d
.endif
@ -412,9 +413,12 @@ release rerelease:
.endif
.endif
# Add version information to those things that need it.
( cd ${CHROOTDIR}/usr/src/sys/conf && \
mv newvers.sh foo && \
sed "s/^RELEASE=.*/RELEASE=${BUILDNAME}/" foo > newvers.sh && rm foo )
if [ ! -f ${CHROOTDIR}/tmp/.world_done ]; then \
cd ${CHROOTDIR}/usr/src/sys/conf && \
mv newvers.sh foo && \
sed "s/^RELEASE=.*/RELEASE=${BUILDNAME}/" foo > newvers.sh && \
rm foo; \
fi
-test -f install.cfg && cp install.cfg ${CHROOTDIR}/usr/src/release
echo "#!/bin/sh" > ${CHROOTDIR}/mk
echo "set -ex" >> ${CHROOTDIR}/mk