misc/128610: [patch] /usr/src: the iso.1 target of make release does not include the ${CD_PACKAGE_TREE}/dvd1 directory structure when it exists

[Stephen Heemeyer]

>Number:         128610
>Category:       misc
>Synopsis:       [patch] /usr/src:  the iso.1 target of make release does not include the ${CD_PACKAGE_TREE}/dvd1 directory structure when it exists
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 05 14:00:15 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Stephen Heemeyer
>Release:        FreeBSD 7
>Organization:
>Environment:
FreeBSD muir.local 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Mon Nov  3 14:45:56 CST 2008     root at muir.local:/usr/obj/amd64/usr/src/sys/CUSTOM  amd64

>Description:
During a make release if MAKE_ISOS and the new MAKE_DVD is enabled the iso.1 target does not include the ${CD_PACKAGE_TREE}/dvd1 directory structure when it exists.

The same problem appears to affect the FreeBSD 6 branch as well.
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.924.2.6
diff -u -d -r1.924.2.6 Makefile
--- Makefile    22 Oct 2008 15:39:28 -0000      1.924.2.6
+++ Makefile    5 Nov 2008 13:14:53 -0000
@@ -1091,7 +1091,7 @@
 CD_DISC3_PKGS= ${CD_PACKAGE_TREE}/disc3
 .endif
 .if exists(${CD_PACKAGE_TREE}/dvd1)
-CD_DVD_PKGS=   ${CD_PACKAGE_TREE}/dvd1
+CD_DVD1_PKGS=  ${CD_PACKAGE_TREE}/dvd1
 .endif
 .endif
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: