Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 21 Mar 2006 01:27:46 +0200
From:      Ruslan Ermilov <ru@freebsd.org>
To:        Steve Kargl <sgk@troutmask.apl.washington.edu>
Cc:        freebsd-current@freebsd.org
Subject:   Re: mergemaster broken?
Message-ID:  <20060320232746.GI83781@ip.net.ua>
In-Reply-To: <20060320231604.GH83781@ip.net.ua>
References:  <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu> <20060320231604.GH83781@ip.net.ua>
next in thread | previous in thread | raw e-mail | index | archive | help 

--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--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060320232746.GI83781>