It turns out the ia64 architecture's disc2 overflows if we put the
ports/ tree on it. This makes putting the ports/ tree on disc2 at all dependent on the NOPORTREADMES knob as well as the NOPORT knob (at the moment NOPORT may be set while NOPORTREADMES isn't, that should probably be revisited). And it hardcodes ia64 for NOPORTREADMES by request the ia64 release builder. While here really get rid of the temp file 'make index' leaves behind. Tested by: i386 and ia64 'make release' Reviewed by: marcel MFC after: 1 day
This commit is contained in:
parent
3075c18308
commit
88f69650e5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=135997
@ -254,6 +254,13 @@ CD_DISC1= ${CD}/disc1
|
||||
CD_DISC2= ${CD}/disc2
|
||||
_MK?= ${CHROOTDIR}/mk
|
||||
|
||||
# Some architectures may not have space for the ports tree on disc2.
|
||||
# For these architectures there is no sense building the README.html
|
||||
# files no matter what.
|
||||
.if ${TARGET_ARCH} == "ia64"
|
||||
NOPORTREADMES= yes
|
||||
.endif
|
||||
|
||||
# Where the bootstrap ports (see DOCPORTS) get installed.
|
||||
LOCALDIR= /usr/local/bin
|
||||
|
||||
@ -508,7 +515,7 @@ release rerelease:
|
||||
echo " cd /usr/ports" >> ${_MK}
|
||||
echo " rm -f INDEX*" >> ${_MK}
|
||||
echo " make index -DINDEX_PRISTINE" >> ${_MK}
|
||||
echo " rm -f INDEX.tmp" >> ${_MK}
|
||||
echo " rm -f INDEX*.tmp" >> ${_MK}
|
||||
echo " touch /tmp/.skip_ports_index" >> ${_MK}
|
||||
echo " echo \">>> make index finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${_MK}
|
||||
echo "fi" >> ${_MK}
|
||||
@ -915,7 +922,7 @@ cdrom.1:
|
||||
@cp ${.CURDIR}/fixit.profile ${CD_DISC2}/.profile
|
||||
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf
|
||||
@echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf
|
||||
.if !defined(NOPORTS)
|
||||
.if !defined(NOPORTS) && !defined(NOPORTREADMES)
|
||||
@tar --exclude CVS --exclude 'ports/distfiles/*' -czf - \
|
||||
-C /usr ports | (cd ${CD_DISC2}/usr; tar -xpBf -)
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user