From owner-freebsd-hackers@FreeBSD.ORG Wed Apr 22 15:30:55 2009 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 673B610656B0; Wed, 22 Apr 2009 15:30:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 3AF8A8FC1B; Wed, 22 Apr 2009 15:30:55 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id CE92A46B17; Wed, 22 Apr 2009 11:30:54 -0400 (EDT) Received: from jhbbsd.hudson-trading.com (unknown [209.249.190.8]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 95DB28A01B; Wed, 22 Apr 2009 11:30:53 -0400 (EDT) From: John Baldwin To: freebsd-hackers@freebsd.org Date: Wed, 22 Apr 2009 09:57:43 -0400 User-Agent: KMail/1.9.7 References: <49EA549E.2060001@FreeBSD.org> <200904200950.16371.jhb@freebsd.org> <49ED8131.40603@FreeBSD.org> In-Reply-To: <49ED8131.40603@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-7" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200904220957.43717.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 22 Apr 2009 11:30:53 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.2 required=4.2 tests=AWL,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: Manolis Kiagias Subject: Re: Some questions on 'make release' X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2009 15:30:55 -0000 On Tuesday 21 April 2009 4:17:53 am Manolis Kiagias wrote: > John Baldwin wrote: > > On Saturday 18 April 2009 6:30:54 pm Manolis Kiagias wrote: > > > >> # make release CHROOTDIR=/data/release BUILDNAME=7.2-PRERELEASE > >> CVSROOT=/data/ncvs EXTSRCDIR=/usr/src CD_PACKAGE_TREE=/data/packages > >> -DNODOC -DNOPORTS -DNO_FLOPPIES -DMAKE_ISOS > >> > >> which completes, without errors but without adding the packages to any > >> CD or the DVD. I found out that I can add the packages after the build > >> by running manually /usr/src/release/i386/mkisoimage.sh with appropriate > >> arguments (and the resulting CD seems to work fine). But I can't seem > >> to convince make release to do this. > >> > > > > This should work. I would maybe hack on src/release/Makefile and remove the > > '@' from the lines in the iso.1 target to make sure it is doing things the way > > you expect. You could make mkisoimages.sh echo the mkisofs command line as > > well perhaps. > > > > > Thank you John. I followed your suggestions, but I am still baffled. > I removed the '@' from the Makefile and added an echo of my own after the > > echo "Creating iso images..." > > in the iso.1 target to print the values of CD and CD_DISC1_PKGS variables: > > echo "CD is ${CD}" > echo "CD_DISC1_PKGS is ${CD_DISC1_PKGS}" > > Running the make release I can see the "Creating iso images..." but not > any of my messages. It is as if another copy of the Makefile is executed > (without the changes). > (Note I switched from EXTSRCDIR to a real CVSROOT, so it is not my > /usr/src that is copied to the release work area) Right, the release process chroot's into your release area and then uses that /usr/src/release/Makefile for the extra targets. You can build the release once and then just update the release Makefile in the chroot area and use 'make rerelease' for testing. > Any more suggestions are welcome, as my trial and error approach takes > about 3 hours in the machine used for the build ;) Use 'make rerelease'. It will simply pick up where the last one stopped. If you need to force it to rebuild just the ISO's you can delete the iso cookie file created by the iso.1 target after it finishes before using 'rerelease'. This should dramatically lower your build time (a few seconds vs 3 hours). -- John Baldwin