From owner-svn-src-all@freebsd.org Wed Feb 3 01:45:03 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4574BA99ACA; Wed, 3 Feb 2016 01:45:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 33F5D1CEB; Wed, 3 Feb 2016 01:45:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id 2C43311EE; Wed, 3 Feb 2016 01:45:03 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id D84FBD0EA; Wed, 3 Feb 2016 01:45:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id NDqAb90y2A1u; Wed, 3 Feb 2016 01:44:56 +0000 (UTC) Content-Type: text/plain; charset=us-ascii DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 0E97DD0E6 Mime-Version: 1.0 (1.0) Subject: Re: svn commit: r295184 - head From: Bryan Drewery X-Mailer: iPhone Mail (12H143) In-Reply-To: <201602030140.u131e8hg045908@repo.freebsd.org> Date: Tue, 2 Feb 2016 17:44:53 -0800 Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <63E4ABF9-89A8-46A4-8D48-3E85C0DA1892@FreeBSD.org> References: <201602030140.u131e8hg045908@repo.freebsd.org> To: "Conrad E. Meyer" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Feb 2016 01:45:03 -0000 Thank you! Regards, Bryan Drewery > On Feb 2, 2016, at 17:40, Conrad E. Meyer wrote: >=20 > Author: cem > Date: Wed Feb 3 01:40:07 2016 > New Revision: 295184 > URL: https://svnweb.freebsd.org/changeset/base/295184 >=20 > Log: > Revert r295167 at bdrewery's request >=20 > $ svn merge -c -295167 . >=20 > JHB reports Navdeep reports that it breaks distribution and etcupdate. >=20 > Approved by: bdrewery >=20 > Modified: > head/Makefile.inc1 >=20 > Modified: head/Makefile.inc1 > =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=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/Makefile.inc1 Wed Feb 3 01:29:06 2016 (r295183) > +++ head/Makefile.inc1 Wed Feb 3 01:40:07 2016 (r295184) > @@ -1087,7 +1087,9 @@ distrib-dirs: .MAKE .PHONY > ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=3D${TMPPATH} ${MAKE} \ > ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=3D${METALOG} ${.TARGET} >=20 > -distribution: distrib-dirs .MAKE .PHONY > +distribution: .MAKE .PHONY > + ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=3D${TMPPATH} ${MAKE} \ > + ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=3D${METALOG} ${.TARGET} > ${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=3D${TMPPATH} \ > ${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \ > METALOG=3D${METALOG} installconfig >=20