From owner-freebsd-current@freebsd.org Sat Nov 7 18:19:24 2015 Return-Path: Delivered-To: freebsd-current@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 D5EDAA28E35 for ; Sat, 7 Nov 2015 18:19:24 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org [IPv6:2001:1900:2254:206a::50:5]) by mx1.freebsd.org (Postfix) with ESMTP id BC47C17D6 for ; Sat, 7 Nov 2015 18:19:24 +0000 (UTC) (envelope-from marck@rinet.ru) Received: by mailman.ysv.freebsd.org (Postfix) id BB76BA28E34; Sat, 7 Nov 2015 18:19:24 +0000 (UTC) Delivered-To: current@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 A140DA28E30 for ; Sat, 7 Nov 2015 18:19:24 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34EBC17B7; Sat, 7 Nov 2015 18:19:23 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.5/8.14.5) with ESMTP id tA7IJHPb054961; Sat, 7 Nov 2015 21:19:18 +0300 (MSK) (envelope-from marck@rinet.ru) Date: Sat, 7 Nov 2015 21:19:17 +0300 (MSK) From: Dmitry Morozovsky To: Bryan Drewery cc: gad@freebsd.org, current@freebsd.org Subject: Re: mtree patch for WITHOUT_LPR In-Reply-To: Message-ID: References: <563E2EB1.6030005@shatow.net> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (woozle.rinet.ru [0.0.0.0]); Sat, 07 Nov 2015 21:19:19 +0300 (MSK) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 07 Nov 2015 18:19:25 -0000 On Sat, 7 Nov 2015, Dmitry Morozovsky wrote: > > > +++ etc/mtree/BSD.include.dist (working copy) > > > @@ -7,10 +7,6 @@ > > > . > > > arpa > > > .. > > > - atf-c > > > - .. > > > - atf-c++ > > > - .. > > > > Why? > > ehhm... Well, it seems coincidence, but my stable/10 system install these > two on every installworld, and complaints about them every check-old > > Looking at Makefiles, yes, I do not see any connection with lpr, sorry for > that. Ah I see. I incorrectly started patching stable/10 instead of current. atf things seem to be non-MFCed leftoversi or some side story. Here is (hopefully correct) simplified patch against head: Index: etc/Makefile =================================================================== --- etc/Makefile (revision 290360) +++ etc/Makefile (working copy) @@ -351,6 +351,9 @@ MTREES+= mtree/BSD.lib32.dist /usr MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr .endif +.if ${MK_LPR} != "no" +MTREES+= mtree/BSD.lpr.dist /usr +.endif .if ${MK_TESTS} != "no" MTREES+= mtree/BSD.tests.dist ${TESTSBASE} MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} Index: etc/mtree/BSD.lpr.dist =================================================================== --- etc/mtree/BSD.lpr.dist (nonexistent) +++ etc/mtree/BSD.lpr.dist (working copy) @@ -0,0 +1,30 @@ +# $FreeBSD$ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + include + atf-c + .. + atf-c++ + .. + libexec + lpr + ru + .. + .. + share + atf + .. + doc + atf + .. + smm + 07.lpd + .. + .. + .. + .. +.. Index: etc/mtree/BSD.usr.dist =================================================================== --- etc/mtree/BSD.usr.dist (revision 290360) +++ etc/mtree/BSD.usr.dist (working copy) @@ -118,10 +118,6 @@ .. hyperv .. - lpr - ru - .. - .. sendmail .. sm.bin @@ -266,8 +262,6 @@ .. 06.nfs .. - 07.lpd - .. 08.sendmailop .. 11.timedop Index: etc/mtree/Makefile =================================================================== --- etc/mtree/Makefile (revision 290360) +++ etc/mtree/Makefile (working copy) @@ -6,6 +6,7 @@ BSD.include.dist \ BSD.root.dist \ ${_BSD.lib32.dist} \ + ${_BSD.lpr.dist} \ ${_BSD.sendmail.dist} \ ${_BSD.tests.dist} \ BSD.usr.dist \ @@ -20,6 +21,9 @@ .if ${MK_LIB32} != "no" _BSD.lib32.dist= BSD.lib32.dist .endif +.if ${MK_LPR} != "no" +_BSD.lpr.dist= BSD.lpr.dist +.endif .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------