Date: Wed, 23 Jan 2002 08:22:39 +0100 (MET) From: Adrian Steinmann <ast@marabu.ch> To: FreeBSD-gnats-submit@freebsd.org Subject: misc/34194: 'make release' removes distfiles too early when making ISO images Message-ID: <200201230722.g0N7MdD83170@rumori.com>
next in thread | raw e-mail | index | archive | help
>Number: 34194
>Category: misc
>Synopsis: 'make release' removes distfiles too early when making ISO images
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 22 23:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Adrian Steinmann <ast@marabu.ch>
>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:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200201230722.g0N7MdD83170>