Turn off the dvdrom target by default. dvd1.iso is now built by

specifying 'WITH_DVD=1' during 'make release'.

This caused some problems during the freebsd-update builds for
10.0-BETA4.

MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2013-12-02 18:47:57 +00:00
parent fa6b4c32ba
commit f7f650c76a
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=258853
2 changed files with 7 additions and 7 deletions

View file

@ -20,7 +20,7 @@
# NOPORTS: if set, do not distribute ports tree
# NOSRC: if set, do not distribute source tree
# NODOC: if set, do not generate release documentation
# NODVD: if set, do not generate dvd1.iso
# WITH_DVD: if set, generate dvd1.iso
# TARGET/TARGET_ARCH: architecture of built release
#
@ -79,7 +79,7 @@ IMAGES=
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
RELEASE_TARGETS+= cdrom
IMAGES+= disc1.iso bootonly.iso
. if !defined(NODVD)
. if defined(WITH_DVD)
RELEASE_TARGETS+= dvdrom
IMAGES+= dvd1.iso
. endif

View file

@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd November 18, 2013
.Dd December 2, 2013
.Dt RELEASE 7
.Os
.Sh NAME
@ -230,10 +230,6 @@ When set,
will prevent the
.Fa doc.txz
distribution package from being created.
.It Va NODVD
Set to a non-empty value to skip the
.Cm dvdrom
target.
.It Va NOPORTS
Set to a non-empty value to skip the
.Li ports/
@ -245,6 +241,10 @@ will prevent the
distribution package from being created.
Setting this also sets
.Va NODOC .
.It Va WITH_DVD
Set to a non-empty value to include the
.Cm dvdrom
target.
.El
.Sh MAKEFILE TARGETS
The release makefile