svn commit: r295167 - head

2016-02-02 Thread Bryan Drewery 
Author: bdrewery
Date: Tue Feb  2 21:11:23 2016
New Revision: 295167
URL: https://svnweb.freebsd.org/changeset/base/295167

Log:
  Deduplicate distrib-dirs logic from r289086 in distribution.
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==
--- head/Makefile.inc1  Tue Feb  2 21:10:55 2016(r295166)
+++ head/Makefile.inc1  Tue Feb  2 21:11:23 2016(r295167)
@@ -1087,9 +1087,7 @@ distrib-dirs: .MAKE .PHONY
${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
-distribution: .MAKE .PHONY
-   ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-   ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
+distribution: distrib-dirs .MAKE .PHONY
${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
METALOG=${METALOG} installconfig
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295167 - head

2016-02-02 Thread Bryan Drewery 
Wow! Please revert. I'm AFK for a few hours.

Regards,
Bryan Drewery

> On Feb 2, 2016, at 17:10, John Baldwin  wrote:
> 
>> On Tuesday, February 02, 2016 09:11:24 PM Bryan Drewery wrote:
>> Author: bdrewery
>> Date: Tue Feb  2 21:11:23 2016
>> New Revision: 295167
>> URL: https://svnweb.freebsd.org/changeset/base/295167
>> 
>> Log:
>>  Deduplicate distrib-dirs logic from r289086 in distribution.
>> 
>>  Sponsored by:EMC / Isilon Storage Division
> 
> Navdeep reported on IRC that this broke distribution resulting in an empty
> tree.  This caused etcupdate to think that all of the files had been removed
> (so it happily removed all the stock bits from /etc).
> 
> -- 
> John Baldwin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295167 - head

2016-02-02 Thread NGie Cooper 
On Tue, Feb 2, 2016 at 5:10 PM, John Baldwin  wrote:
> On Tuesday, February 02, 2016 09:11:24 PM Bryan Drewery wrote:
>> Author: bdrewery
>> Date: Tue Feb  2 21:11:23 2016
>> New Revision: 295167
>> URL: https://svnweb.freebsd.org/changeset/base/295167
>>
>> Log:
>>   Deduplicate distrib-dirs logic from r289086 in distribution.
>>
>>   Sponsored by:   EMC / Isilon Storage Division
>
> Navdeep reported on IRC that this broke distribution resulting in an empty
> tree.  This caused etcupdate to think that all of the files had been removed
> (so it happily removed all the stock bits from /etc).

+1 with Jenkins I think... https://jenkins.freebsd.org/job/FreeBSD_HEAD/107/
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295167 - head

2016-02-02 Thread John Baldwin 
On Tuesday, February 02, 2016 09:11:24 PM Bryan Drewery wrote:
> Author: bdrewery
> Date: Tue Feb  2 21:11:23 2016
> New Revision: 295167
> URL: https://svnweb.freebsd.org/changeset/base/295167
> 
> Log:
>   Deduplicate distrib-dirs logic from r289086 in distribution.
>   
>   Sponsored by:   EMC / Isilon Storage Division

Navdeep reported on IRC that this broke distribution resulting in an empty
tree.  This caused etcupdate to think that all of the files had been removed
(so it happily removed all the stock bits from /etc).

-- 
John Baldwin
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r295167 - head

2016-02-02 Thread Bryan Drewery 
Oh wow I just realized the issue. Earlier I tested and saw distrib-dirs run and 
considered it a success. Sorry about that.

Regards,
Bryan Drewery

> On Feb 2, 2016, at 17:29, Bryan Drewery  wrote:
> 
> Wow! Please revert. I'm AFK for a few hours.
> 
> Regards,
> Bryan Drewery
> 
>>> On Feb 2, 2016, at 17:10, John Baldwin  wrote:
>>> 
>>> On Tuesday, February 02, 2016 09:11:24 PM Bryan Drewery wrote:
>>> Author: bdrewery
>>> Date: Tue Feb  2 21:11:23 2016
>>> New Revision: 295167
>>> URL: https://svnweb.freebsd.org/changeset/base/295167
>>> 
>>> Log:
>>> Deduplicate distrib-dirs logic from r289086 in distribution.
>>> 
>>> Sponsored by:EMC / Isilon Storage Division
>> 
>> Navdeep reported on IRC that this broke distribution resulting in an empty
>> tree.  This caused etcupdate to think that all of the files had been removed
>> (so it happily removed all the stock bits from /etc).
>> 
>> -- 
>> John Baldwin
> 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"