From owner-freebsd-stable  Sun Apr  8 20:23: 9 2001
Delivered-To: freebsd-stable@freebsd.org
Received: from fw.wintelcom.net (ns1.wintelcom.net [209.1.153.20])
	by hub.freebsd.org (Postfix) with ESMTP id 0095637B422
	for <freebsd-stable@FreeBSD.ORG>; Sun,  8 Apr 2001 20:23:01 -0700 (PDT)
	(envelope-from bright@fw.wintelcom.net)
Received: (from bright@localhost)
	by fw.wintelcom.net (8.10.0/8.10.0) id f393N0x05916;
	Sun, 8 Apr 2001 20:23:00 -0700 (PDT)
Date: Sun, 8 Apr 2001 20:23:00 -0700
From: Alfred Perlstein <bright@wintelcom.net>
To: Tim Zingelman <zingelman@fnal.gov>
Cc: freebsd-stable@FreeBSD.ORG
Subject: Re: make release broken with too many ports/distfiles...
Message-ID: <20010408202300.J15938@fw.wintelcom.net>
References: <Pine.GSO.4.30.0104082045560.940-100000@nova.fnal.gov>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <Pine.GSO.4.30.0104082045560.940-100000@nova.fnal.gov>; from zingelman@fnal.gov on Sun, Apr 08, 2001 at 09:31:47PM -0500
X-all-your-base: are belong to us.
Sender: owner-freebsd-stable@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

* Tim Zingelman <zingelman@fnal.gov> [010408 19:32] wrote:
> On a system with all (or most of) the distfiles existing in
> /usr/ports/distfiles, line 680 of:
> 
>  $FreeBSD: src/release/Makefile,v 1.536.2.40 2000/03/27 16:49:58
> 
> 	@-rm -rf /usr/ports/distfiles/*
> 
> fails to cleanup the duplicated distfiles directory, due to: "Argument
> list too long", and as a result the ports tarball includes the whole set
> of distfiles.  (and that won't fit on a cdrom :)
> 
> Just for reference...
> # cd /usr/ports/distfiles
> # ls *
> /bin/ls: Argument list too long.
> # echo * | wc -c
>    83575
> #

ha! :)

> 
> Here's a trivial patch:

Please provide more context, which makefile is this patch to be
applied against?

> 
> diff -w -u -b -r1.536.2.40 Makefile
> --- Makefile    2001/03/27 16:49:58     1.536.2.40
> +++ Makefile    2001/04/09 02:21:47
> @@ -677,7 +677,8 @@
>         @ln -f ${CD_DISC1}/kernel ${CD_DISC2}/kernel
>  .endif
>  .if !defined(NOPORTS)
> -       @-rm -rf /usr/ports/distfiles/*
> +       @-rm -rf /usr/ports/distfiles
> +       @-mkdir /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 \
> 
> 
> I just started a make release, with this patch in place.  I'll reply to
> this email only if it does not solve the problem as I expect it to.

What if ports/distfiles is a symlink?  Or is this only done during
make release?

How about something like this:

find /usr/ports/distfiles/ -mindepth 1 | xargs rm -rf

?

-- 
-Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org]
Represent yourself, show up at BABUG http://www.babug.org/

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message