Date: Sat, 7 Nov 2015 21:19:17 +0300 (MSK) From: Dmitry Morozovsky <marck@rinet.ru> To: Bryan Drewery <bryan-lists@shatow.net> Cc: gad@freebsd.org, current@freebsd.org Subject: Re: mtree patch for WITHOUT_LPR Message-ID: <alpine.BSF.2.00.1511072108070.6619@woozle.rinet.ru> In-Reply-To: <alpine.BSF.2.00.1511072012060.6619@woozle.rinet.ru> References: <alpine.BSF.2.00.1511071404560.6619@woozle.rinet.ru> <563E2EB1.6030005@shatow.net> <alpine.BSF.2.00.1511072012060.6619@woozle.rinet.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
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 ***
------------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1511072108070.6619>