From nobody@FreeBSD.org  Wed Nov  5 13:53:17 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0EDB1106567B
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  5 Nov 2008 13:53:17 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id ED3308FC1D
	for <freebsd-gnats-submit@FreeBSD.org>; Wed,  5 Nov 2008 13:53:16 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id mA5DrGg2010726
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 5 Nov 2008 13:53:16 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id mA5DrGRI010724;
	Wed, 5 Nov 2008 13:53:16 GMT
	(envelope-from nobody)
Message-Id: <200811051353.mA5DrGRI010724@www.freebsd.org>
Date: Wed, 5 Nov 2008 13:53:16 GMT
From: Stephen Heemeyer <veron.x503@hotmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] /usr/src:  the iso.1 target of make release does not include the ${CD_PACKAGE_TREE}/dvd1 directory structure when it exists
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>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:    kensmith
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 05 14:00:15 UTC 2008
>Closed-Date:    Sun May 04 04:17:51 UTC 2014
>Last-Modified:  Sun May 04 04:17:51 UTC 2014
>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@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:
State-Changed-From-To: open->patched 
State-Changed-By: kensmith 
State-Changed-When: Thu Nov 6 13:36:08 UTC 2008 
State-Changed-Why:  

Patches applied on stable/7, stable/6, and releng/6.4.  I'm not quite 
sure what I did that missed this piece of a merge but this piece should 
have been part of a larger merge - it was correct in head... 

Thanks. 



Responsible-Changed-From-To: freebsd-bugs->kensmith 
Responsible-Changed-By: kensmith 
Responsible-Changed-When: Thu Nov 6 13:36:08 UTC 2008 
Responsible-Changed-Why:  

Patches applied on stable/7, stable/6, and releng/6.4.  I'm not quite 
sure what I did that missed this piece of a merge but this piece should 
have been part of a larger merge - it was correct in head... 

Thanks. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=128610 

From: Garrett Cooper <yaneurabeya@gmail.com>
To: bug-followup@FreeBSD.org,
 veron.x503@hotmail.com
Cc:  
Subject: Re: 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
Date: Thu, 4 Jul 2013 18:04:34 -0700

 Please close this bug.
State-Changed-From-To: patched->closed 
State-Changed-By: linimon 
State-Changed-When: Sun May 4 04:17:32 UTC 2014 
State-Changed-Why:  
OBE. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128610 
>Unformatted:
