Date: Tue, 21 Mar 2006 01:16:04 +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: <20060320231604.GH83781@ip.net.ua> In-Reply-To: <20060320230009.GA55254@troutmask.apl.washington.edu> References: <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
--Bg2esWel0ueIH/G/
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
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:
> >=20
> > *** The directory specified for the temporary root environment,
> > /var/tmp/temproot, exists. This can be a security risk if untrusted
> > users have access to the system.
> >=20
> > Use 'd' to delete the old /var/tmp/temproot and continue
> > Use 't' to select a new temporary root directory
> > Use 'e' to exit mergemaster
> >=20
> > Default is to use /var/tmp/temproot as is
> >=20
> > How should I deal with this? [Use the existing /var/tmp/temproot]=20
> > *** Deleting the old /var/tmp/temproot
> >=20
> > *** Creating the temporary root environment in /var/tmp/temproot
> > *** /var/tmp/temproot ready for use
> > *** Creating and populating directory structure in /var/tmp/temproot
> >=20
> > "/usr/src/etc/Makefile", line 6: Malformed conditional (${MK_SENDMAIL} =
!=3D "no")
> > "/usr/src/etc/Makefile", line 8: if-less endif
> > "/usr/src/etc/Makefile", line 34: Malformed conditional (${MK_LPR} !=3D=
"no")
> > "/usr/src/etc/Makefile", line 36: if-less endif
> > "/usr/src/etc/Makefile", line 38: Malformed conditional (${MK_OPENSSH} =
!=3D "no")
> > "/usr/src/etc/Makefile", line 42: if-less endif
> > "/usr/src/etc/Makefile", line 43: Malformed conditional (${MK_OPENSSL} =
!=3D "no")
> > "/usr/src/etc/Makefile", line 45: if-less endif
> > "/usr/src/etc/Makefile", line 52: Malformed conditional (${MK_SENDMAIL}=
!=3D "no")
> > "/usr/src/etc/Makefile", line 54: if-less endif
> > "/usr/src/etc/Makefile", line 55: Malformed conditional (${MK_BIND} !=
=3D "no")
> > "/usr/src/etc/Makefile", line 57: Malformed conditional (${MK_BIND_LIBS=
} !=3D "no")
> > "/usr/src/etc/Makefile", line 59: if-less endif
> > "/usr/src/etc/Makefile", line 60: if-less endif
> > "/usr/src/etc/Makefile", line 62: Malformed conditional (${MK_BIND_ETC}=
!=3D "no")
> > "/usr/src/etc/Makefile", line 65: if-less endif
> > "/usr/src/etc/Makefile", line 69: Malformed conditional (${MK_SENDMAIL}=
=3D=3D "no")
> > "/usr/src/etc/Makefile", line 71: if-less else
> > "/usr/src/etc/Makefile", line 74: if-less endif
> > "/usr/src/etc/Makefile", line 80: Malformed conditional (${MK_MAN} !=3D=
"no")
> > "/usr/src/etc/Makefile", line 82: if-less endif
> > "/usr/src/etc/Makefile", line 130: Malformed conditional (${MK_I4B} !=
=3D "no")
> > "/usr/src/etc/Makefile", line 132: if-less endif
> > "/usr/src/etc/Makefile", line 133: Malformed conditional (${MK_SENDMAIL=
} !=3D "no")
> > "/usr/src/etc/Makefile", line 135: if-less endif
> > "/usr/src/etc/Makefile", line 136: Malformed conditional (${MK_OPENSSH}=
!=3D "no")
> > "/usr/src/etc/Makefile", line 139: if-less endif
> > "/usr/src/etc/Makefile", line 140: Malformed conditional (${MK_OPENSSL}=
!=3D "no")
> > "/usr/src/etc/Makefile", line 143: if-less endif
> > "/usr/src/etc/Makefile", line 144: Malformed conditional (${MK_KERBEROS=
} !=3D "no")
> > "/usr/src/etc/Makefile", line 148: if-less endif
> > "/usr/src/etc/Makefile", line 161: Malformed conditional (${MK_BIND_ETC=
} !=3D "no")
> > "/usr/src/etc/Makefile", line 164: if-less endif
> > "/usr/src/etc/Makefile", line 165: Malformed conditional (${MK_BIND_MTR=
EE} !=3D "no")
> > "/usr/src/etc/Makefile", line 170: if-less endif
> > "/usr/src/etc/Makefile", line 198: Malformed conditional (${MK_BIND_LIB=
S} !=3D "no")
> > "/usr/src/etc/Makefile", line 201: if-less endif
> > "/usr/src/etc/Makefile", line 202: Malformed conditional (${MK_BIND_MTR=
EE} !=3D "no")
> > "/usr/src/etc/Makefile", line 205: if-less endif
> > "/usr/src/etc/Makefile", line 206: Malformed conditional (${MK_SENDMAIL=
} !=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.
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--Bg2esWel0ueIH/G/
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFEHze0qRfpzJluFF4RAg+zAJ4nQ+6C5hj1IBP6lZNIJQZG1RyaQgCePt4m
tiK7H4LNWSQS1MwRmZPT+qo=
=RUSG
-----END PGP SIGNATURE-----
--Bg2esWel0ueIH/G/--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060320231604.GH83781>