From owner-freebsd-current@FreeBSD.ORG Mon Mar 20 23:28:25 2006 Return-Path: X-Original-To: freebsd-current@freebsd.org 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 3DFB916A42B for ; Mon, 20 Mar 2006 23:28:25 +0000 (UTC) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7169F43D73 for ; Mon, 20 Mar 2006 23:28:20 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id k2KNSJB2073894; Tue, 21 Mar 2006 01:28:19 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ip.net.ua [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 85117-08; Tue, 21 Mar 2006 01:28:04 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id k2KNRPOL073856 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 21 Mar 2006 01:27:25 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id k2KNRk0T099420; Tue, 21 Mar 2006 01:27:46 +0200 (EET) (envelope-from ru) Date: Tue, 21 Mar 2006 01:27:46 +0200 From: Ruslan Ermilov To: Steve Kargl Message-ID: <20060320232746.GI83781@ip.net.ua> References: <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu> <20060320231604.GH83781@ip.net.ua> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="GvznHscUikHnwW2p" Content-Disposition: inline In-Reply-To: <20060320231604.GH83781@ip.net.ua> User-Agent: Mutt/1.5.11 X-Virus-Scanned: amavisd-new at ip.net.ua Cc: freebsd-current@freebsd.org Subject: Re: mergemaster broken? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 20 Mar 2006 23:28:25 -0000 --GvznHscUikHnwW2p Content-Type: multipart/mixed; boundary="LYw3s/afESlflPpp" Content-Disposition: inline --LYw3s/afESlflPpp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 21, 2006 at 01:16:04AM +0200, Ruslan Ermilov wrote: > On Mon, Mar 20, 2006 at 03:00:10PM -0800, Steve Kargl wrote: > > On Mon, Mar 20, 2006 at 02:17:41PM -0800, Steve Kargl wrote: [...] > > > "/usr/src/etc/Makefile", line 206: Malformed conditional (${MK_SENDMA= IL} !=3D "no") > > > "/usr/src/etc/Makefile", line 208: if-less endif > > > make: fatal errors encountered -- cannot continue > > >=20 > > > *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files to > > > the temproot environment > > >=20 > >=20 > > This appears to be related to ru's recent Makefile sweep. > >=20 > mergemaster(8) should be fixed to run "make distrib-dirs" and "make > distribution" from /usr/src, not from /usr/src/etc. >=20 The attached patch seems to work. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --LYw3s/afESlflPpp Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=p Content-Transfer-Encoding: quoted-printable Index: mergemaster.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v retrieving revision 1.53 diff -u -r1.53 mergemaster.sh --- mergemaster.sh 4 Feb 2006 18:24:06 -0000 1.53 +++ mergemaster.sh 20 Mar 2006 23:20:17 -0000 @@ -503,7 +503,7 @@ =20 case "${PRE_WORLD}" in '') - { cd ${SOURCEDIR} && + { cd ${SOURCEDIR%etc} && case "${DESTDIR}" in '') ;; *) @@ -511,12 +511,12 @@ ;; esac make DESTDIR=3D${TEMPROOT} ${ARCHSTRING} distrib-dirs && - MAKEOBJDIRPREFIX=3D${TEMPROOT}/usr/obj make ${ARCHSTRING} obj && - MAKEOBJDIRPREFIX=3D${TEMPROOT}/usr/obj make ${ARCHSTRING} all && + MAKEOBJDIRPREFIX=3D${TEMPROOT}/usr/obj make ${ARCHSTRING} obj SUBDIR= _OVERRIDE=3Detc && + MAKEOBJDIRPREFIX=3D${TEMPROOT}/usr/obj make ${ARCHSTRING} all SUBDIR= _OVERRIDE=3Detc && MAKEOBJDIRPREFIX=3D${TEMPROOT}/usr/obj make ${ARCHSTRING} \ DESTDIR=3D${TEMPROOT} distribution;} || { echo ''; - echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR} and install file= s to"; + echo " *** FATAL ERROR: Cannot 'cd' to ${SOURCEDIR%etc} and install = files to"; echo " the temproot environment"; echo ''; exit 1;} --LYw3s/afESlflPpp-- --GvznHscUikHnwW2p Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFEHzpyqRfpzJluFF4RAiwsAJ0S8tcJ/Zc9bFv23jDaQowzIBQH5ACePyuV dOlQBovZufJUw8pH0REL3Qs= =TayI -----END PGP SIGNATURE----- --GvznHscUikHnwW2p--