From ast@rumori.com Tue Jan 22 23:22:50 2002 Return-Path: Received: from rumori.com (client62-2-193-38.hispeed.ch [62.2.193.38]) by hub.freebsd.org (Postfix) with ESMTP id 3ECA837B402 for ; Tue, 22 Jan 2002 23:22:44 -0800 (PST) Received: (from ast@localhost) by rumori.com (8.11.6/8.11.6) id g0N7MdD83170; Wed, 23 Jan 2002 08:22:39 +0100 (MET) (envelope-from ast) Message-Id: <200201230722.g0N7MdD83170@rumori.com> Date: Wed, 23 Jan 2002 08:22:39 +0100 (MET) From: Adrian Steinmann Reply-To: Adrian Steinmann To: FreeBSD-gnats-submit@freebsd.org Subject: 'make release' removes distfiles too early when making ISO images X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 34194 >Category: misc >Synopsis: 'make release' removes distfiles too early when making ISO images >Confidential: no >Severity: non-critical >Priority: low >Responsible: matusita >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jan 22 23:30:01 PST 2002 >Closed-Date: Fri Feb 8 09:03:09 PST 2002 >Last-Modified: Fri Feb 08 09:05:52 PST 2002 >Originator: Adrian Steinmann >Release: FreeBSD 4.4-STYX i386 >Organization: Webgroup Consulting AG >Environment: System: FreeBSD rumori.com 4.4-STYX FreeBSD 4.4-STYX #2: Fri Aug 31 13:23:17 MEST 2001 root@rumori.com:/usr/src/sys/compile/RUM i386 -stable build system >Description: 'make release' removes ports/distfiles before rolling ports.tgz for the distribution. Later, 'make release' then needs to fetch cdrtools because it wants mkisofs when "-DMAKE_ISOS" is specified. >How-To-Repeat: make release -DMAKE_ISOS >Fix: Instead of removing ports/distfiles, we exclude distfiles in the tar command (analog --exclude CVS, which is already there). The following patch has been verified, the resulting ports.tgz does not contain ports/distfiles, and cdrtools was not fetched during the make release process because it was still present in the (chrooted) usr/ports/distfiles. *** release/Makefile.orig Sat Jan 19 15:56:22 2002 --- release/Makefile Mon Jan 21 17:52:50 2002 *************** *** 789,797 **** @cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies .endif .if !defined(NOPORTS) - @-rm -rf /usr/ports/distfiles/* @mkdir -p ${CD_DISC1}/ports && \ ! tar --exclude CVS -czf ${CD_DISC1}/ports/ports.tgz -C /usr ports && \ cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \ && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) .endif --- 792,800 ---- @cp ${CD_DISC1}/floppies/boot.flp ${CD_DISC2}/floppies .endif .if !defined(NOPORTS) @mkdir -p ${CD_DISC1}/ports && \ ! tar --exclude CVS --exclude distfiles -czf \ ! ${CD_DISC1}/ports/ports.tgz -C /usr ports && \ cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh \ && (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) .endif >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-bugs->matusita Responsible-Changed-By: matusita Responsible-Changed-When: Thu Jan 24 03:05:39 PST 2002 Responsible-Changed-Why: I want to know what's the actual problem, so take this one. http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34194 From: Makoto Matsushita To: Adrian Steinmann Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: misc/34194: 'make release' removes distfiles too early when making ISO images Date: Thu, 24 Jan 2002 20:05:08 +0900 ast> The following patch has been verified, the resulting ports.tgz ast> does not contain ports/distfiles It's wrong. ports.tgz should include empty /usr/ports/distfiles *directory* as it used to be. ast> cdrtools was not fetched during the make release process ast> because it was still present in the (chrooted) ast> usr/ports/distfiles. Why this is required? -- - Makoto `MAR' Matsushita State-Changed-From-To: open->feedback State-Changed-By: matusita State-Changed-When: Fri Jan 25 20:36:17 PST 2002 State-Changed-Why: Waiting a feedback from the orignal PR submitter that why distfiles is requested to be cleared. http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34194 From: Giorgos Keramidas To: Adrian Steinmann Cc: bug-followup@freebsd.org Subject: Re: misc/34194: 'make release' removes distfiles too early when making ISO images Date: Sun, 27 Jan 2002 02:25:44 +0200 Adding to audit trail: Date: Sat, 26 Jan 2002 08:39:01 +0100 From: Adrian Steinmann To: freebsd-gnats-submit@FreeBSD.org, matusita@FreeBSD.org Subject: pending/34295: Re: Problem Report misc/34194: 'make release' removes distfiles too early when making ISO images Ah, if an empty ports/distfiles needs to be in the ports.tgz, my patch is indeed incomplete. Note that cdrtools is need and re-fetched for mkisofs when the ISO images are created - this happens when one passes the -DMAKE_ISOS flag to 'make release'. Making the ISO images earlier would have the effect that /usr/ports/distfiles would be non-empty, which is just as bad. Why not add a 'mkdir /usr/ports/distfiles' in ports/install.sh? Adrian State-Changed-From-To: feedback->closed State-Changed-By: matusita State-Changed-When: Fri Feb 8 09:03:09 PST 2002 State-Changed-Why: This problem is fixed in src/release/Makefile rev 1.655/1.656 (for 5-current) and rev 1.536.2.73/1.536.2.74 (for 4-stable). Thanks. http://www.FreeBSD.org/cgi/query-pr.cgi?pr=34194 >Unformatted: