From owner-freebsd-current@FreeBSD.ORG Tue Jul 22 05:36:33 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4C6EF37B401; Tue, 22 Jul 2003 05:36:33 -0700 (PDT) Received: from whale.sunbay.crimea.ua (whale.sunbay.crimea.ua [212.110.138.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 365A143F3F; Tue, 22 Jul 2003 05:36:26 -0700 (PDT) (envelope-from ru@sunbay.com) Received: from whale.sunbay.crimea.ua (ru@localhost [127.0.0.1]) h6MCaM0U041781 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 22 Jul 2003 15:36:22 +0300 (EEST) (envelope-from ru@sunbay.com) Received: (from ru@localhost) by whale.sunbay.crimea.ua (8.12.9/8.12.8/Submit) id h6MCaImL041774; Tue, 22 Jul 2003 15:36:18 +0300 (EEST) (envelope-from ru) Date: Tue, 22 Jul 2003 15:36:18 +0300 From: Ruslan Ermilov To: Gregory Neil Shapiro , Doug Barton Message-ID: <20030722123618.GB36151@sunbay.com> References: <20030707120002.18029e92.yosimoto@waishi.jp> <20030707032114.GJ49194@horsey.gshapiro.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="at6+YcpfzWZg/htY" Content-Disposition: inline In-Reply-To: <20030707032114.GJ49194@horsey.gshapiro.net> User-Agent: Mutt/1.5.4i cc: current@freebsd.org Subject: Re: mergemaster broken X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2003 12:36:33 -0000 --at6+YcpfzWZg/htY Content-Type: multipart/mixed; boundary="bKyqfOwhbdpXa4YI" Content-Disposition: inline --bKyqfOwhbdpXa4YI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Jul 06, 2003 at 08:21:14PM -0700, Gregory Neil Shapiro wrote: > > > mergemaster -dv > >=20 > > [snip] > >=20 > > cd /usr/src/etc/sendmail; make distribution > > install -o root -g wheel -m 644 /usr/src/etc/sendmail/freebsd.mc freeb= sd.cf /var/tmp/temproot.0707.11.55/etc/mail > > install: freebsd.cf: No such file or directory > > *** Error code 71 >=20 > Thanks, I just committed a fix for this. >=20 Er, The correct fix would be to revert this change from sendmail/Makefile, and fix mergemaster(8) instead, as shown in the attached patch. The "distribution" target of src/etc/Makefile is part of the standard "distribute" target, and as such it's just a specialized version of the "install" target that should not _build_ anything (and that was fixed in rev. 1.23). To build things, one needs to call the "all" target, which the attached patch simply does. It's just a pure coincidence that the "distribution" part of src/etc/Makefile does not need to build anything (in the object directory). Can you please test it and commit? Cheers, --=20 Ruslan Ermilov Sysadmin and DBA, ru@sunbay.com Sunbay Software Ltd, ru@FreeBSD.org FreeBSD committer --bKyqfOwhbdpXa4YI Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Index: mergemaster.sh =================================================================== RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v retrieving revision 1.46 diff -u -r1.46 mergemaster.sh --- mergemaster.sh 3 May 2003 06:35:19 -0000 1.46 +++ mergemaster.sh 22 Jul 2003 12:31:23 -0000 @@ -508,6 +508,7 @@ esac make DESTDIR=${TEMPROOT} distrib-dirs && make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj && + make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj all && make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \ distribution;} || { echo ''; --bKyqfOwhbdpXa4YI-- --at6+YcpfzWZg/htY Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (FreeBSD) iD8DBQE/HS/CUkv4P6juNwoRAsjrAJ9i24RbvyNLNcLbRYK7iRqRxiYY5wCfQfCT TQannujTzl2k2TYmcj5WwvM= =K4zz -----END PGP SIGNATURE----- --at6+YcpfzWZg/htY--