diff options
| author | ru <ru@FreeBSD.org> | 2003-02-26 15:32:12 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-02-26 15:32:12 +0000 |
| commit | c65b6d4325cbd6ac51155406331d8f9895f2f058 (patch) | |
| tree | 12adfba935bdde2126973e2bfc1cc2bd4de05a22 /release/Makefile | |
| parent | b0f2f954b20c1370a09567f78b27f28e5f9db12a (diff) | |
| download | FreeBSD-src-c65b6d4325cbd6ac51155406331d8f9895f2f058.zip FreeBSD-src-c65b6d4325cbd6ac51155406331d8f9895f2f058.tar.gz | |
If we are told to update the sources in "make rerelease", we also
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? :-)
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 34b92e6..8e6bdab 100644 --- a/release/Makefile +++ b/release/Makefile @@ -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 |
