From owner-cvs-all@FreeBSD.ORG Wed Mar 23 15:28:58 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EBB616A4CE for ; Wed, 23 Mar 2005 15:28:58 +0000 (GMT) Received: from mail23.sea5.speakeasy.net (mail23.sea5.speakeasy.net [69.17.117.25]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2759143D5D for ; Wed, 23 Mar 2005 15:28:58 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: (qmail 22693 invoked from network); 23 Mar 2005 15:28:57 -0000 Received: from server.baldwin.cx ([216.27.160.63]) (envelope-sender )AES256-SHA encrypted SMTP for ; 23 Mar 2005 15:28:57 -0000 Received: from [10.50.41.231] (gw1.twc.weather.com [216.133.140.1]) (authenticated bits=0) by server.baldwin.cx (8.13.1/8.13.1) with ESMTP id j2NFSpbX062191; Wed, 23 Mar 2005 10:28:52 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: src-committers@FreeBSD.org Date: Wed, 23 Mar 2005 10:30:31 -0500 User-Agent: KMail/1.6.2 References: <200503231501.j2NF1tYO051284@repoman.freebsd.org> In-Reply-To: <200503231501.j2NF1tYO051284@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200503231030.31448.jhb@FreeBSD.org> X-Spam-Status: No, score=-102.8 required=4.2 tests=ALL_TRUSTED, USER_IN_WHITELIST autolearn=failed version=3.0.2 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on server.baldwin.cx cc: cvs-src@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/release Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2005 15:28:58 -0000 On Wednesday 23 March 2005 10:01 am, John Baldwin wrote: > 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 With these changes, the release process including putting packages and building the ISO images should look something like this: # cd /usr/src/release # make PKG_TREE=/path/to/portbuild PKG_DEST=/path/to/tmp/pkg .... # make CD_PACKAGE_TREE=/path/to/tmp/pkg MAKE_ISOS=yes release ... -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org