svn commit: r258853 - in head: release share/man/man7
Glen Barber
gjb at FreeBSD.org
Mon Dec 2 18:47:58 UTC 2013
Author: gjb
Date: Mon Dec 2 18:47:57 2013
New Revision: 258853
URL: http://svnweb.freebsd.org/changeset/base/258853
Log:
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
Modified:
head/release/Makefile
head/share/man/man7/release.7
Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile Mon Dec 2 18:20:07 2013 (r258852)
+++ head/release/Makefile Mon Dec 2 18:47:57 2013 (r258853)
@@ -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
Modified: head/share/man/man7/release.7
==============================================================================
--- head/share/man/man7/release.7 Mon Dec 2 18:20:07 2013 (r258852)
+++ head/share/man/man7/release.7 Mon Dec 2 18:47:57 2013 (r258853)
@@ -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
More information about the svn-src-all
mailing list