From owner-cvs-src@FreeBSD.ORG  Wed Mar 23 15:01:55 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 6339916A4CE; Wed, 23 Mar 2005 15:01:55 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 483F543D1F; Wed, 23 Mar 2005 15:01:55 +0000 (GMT)
	(envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2NF1tGG051285;
	Wed, 23 Mar 2005 15:01:55 GMT
	(envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2NF1tYO051284;
	Wed, 23 Mar 2005 15:01:55 GMT
	(envelope-from jhb)
Message-Id: <200503231501.j2NF1tYO051284@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 23 Mar 2005 15:01:55 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/release Makefile
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Mar 2005 15:01:55 -0000

jhb         2005-03-23 15:01:55 UTC

  FreeBSD src repository

  Modified files:
    release              Makefile 
  Log:
  What should be the last major changes to the ISO layout:
  - When a separate livefs ISO is used, change the name of the tree directory
    to be R/cdrom/livefs and change the name of the iso to livefs.iso rather
    than using disc2.  Instead, disc2 is now always going to be the packages
    disc regardless of the presence of a separate livefs which makes things
    simpler.
  - Build a very simple disc2 tree under R/cdrom that just includes the
    cdrom.inf file that the packages need.  Also, build a disc2.iso image
    in the iso.1 target.  Disc 2's volume label is "FreeBSD_Packages".
  - Retire CD_EXTRA_BITS and replace it with CD_PACKAGE_TREE.  CD_EXTRA_BITS
    was specific to disc1, but CD_PACKAGE_TREE instead should point to a
    directory that has disc1 and disc2 subdirectories that contain the extra
    bits for each image.
  - Rename the bootonly volume label to "FreeBSD_bootonly" and just hardcode
    the disc1 and livefs volume names and iso suffixes.
  
  Revision  Changes    Path
  1.881     +34 -23    src/release/Makefile