Re: svn commit: r298140 - in head/etc: . devd
On Sunday, April 17, 2016 04:12:16 AM Glen Barber wrote: > On Sat, Apr 16, 2016 at 09:01:04PM -0700, NGie Cooper wrote: > > > On Apr 16, 2016, at 20:45, Glen Barber wrote: > > > > > > Author: gjb > > > Date: Sun Apr 17 03:45:45 2016 > > > New Revision: 298140 > > > URL: https://svnweb.freebsd.org/changeset/base/298140 > > > > > > Log: > > > Fix etcupdate(8) with rc.sendmail and devd/*. It turns out > > > BIN1 and such in etc/* cannot use FILESGROUPS. > > > > > > Reported by:peter > > > Sponsored by:The FreeBSD Foundation > > > > This only applies to etc/Makefile . I offered to change that a couple > > years ago and it was met with a large number of complaints and some teeth > > gnashing. > Based on the report, etc/devd/Makefile is affected as well. > > Glen Yep. The short version is that 'make installworld' doesn't put things into /etc - that's what 'make distribution', mergemaster, etcupdate, and 3rd party tools do. Having 'make installworld' suddenly begin to partly update /etc files is quite a POLA violation and caused etcupdate to delete them as they disappeared from the 'distribution' manifest. eg: D /etc/auto_master D /etc/devd/hyperv.conf D /etc/devd/uath.conf D /etc/devd/ulpt.conf D /etc/devd/usb.conf D /etc/devd/zfs.conf D /etc/rc.sendmail U /etc/mtree/BSD.var.dist -- Peter Wemm - pe...@wemm.org; pe...@freebsd.org; pe...@yahoo-inc.com; KI6FJV UTF-8: for when a ' or ... just won\342\200\231t do\342\200\246 signature.asc Description: This is a digitally signed message part.
Re: svn commit: r298140 - in head/etc: . devd
On Sat, Apr 16, 2016 at 09:01:04PM -0700, NGie Cooper wrote: > > > On Apr 16, 2016, at 20:45, Glen Barber wrote: > > > > Author: gjb > > Date: Sun Apr 17 03:45:45 2016 > > New Revision: 298140 > > URL: https://svnweb.freebsd.org/changeset/base/298140 > > > > Log: > > Fix etcupdate(8) with rc.sendmail and devd/*. It turns out > > BIN1 and such in etc/* cannot use FILESGROUPS. > > > > Reported by:peter > > Sponsored by:The FreeBSD Foundation > > This only applies to etc/Makefile . I offered to change that a couple years > ago and it was met with a large number of complaints and some teeth gnashing. Based on the report, etc/devd/Makefile is affected as well. Glen signature.asc Description: PGP signature
Re: svn commit: r298140 - in head/etc: . devd
> On Apr 16, 2016, at 20:45, Glen Barber wrote:
>
> Author: gjb
> Date: Sun Apr 17 03:45:45 2016
> New Revision: 298140
> URL: https://svnweb.freebsd.org/changeset/base/298140
>
> Log:
> Fix etcupdate(8) with rc.sendmail and devd/*. It turns out
> BIN1 and such in etc/* cannot use FILESGROUPS.
>
> Reported by:peter
> Sponsored by:The FreeBSD Foundation
This only applies to etc/Makefile . I offered to change that a couple years ago
and it was met with a large number of complaints and some teeth gnashing.
> Modified:
> head/etc/Makefile
> head/etc/devd/Makefile
>
> Modified: head/etc/Makefile
> ==
> --- head/etc/MakefileSun Apr 17 02:51:04 2016(r298139)
> +++ head/etc/MakefileSun Apr 17 03:45:45 2016(r298140)
> @@ -83,13 +83,8 @@ BIN1+= apmd.conf
> .endif
>
> .if ${MK_AUTOFS} != "no"
> -FILESGROUPS+=AUTOFS
> -AUTOFS+=auto_master
> +BIN1+=auto_master
> .endif
> -AUTOFSDIR=/etc
> -AUTOFSMODE=${BINMODE}
> -AUTOFSPACKAGE=autofs
> -AUTOFSTAGS=config
>
> .if ${MK_FREEBSD_UPDATE} != "no"
> BIN1+= freebsd-update.conf
> @@ -141,12 +136,8 @@ BIN1+= pf.os
> .endif
>
> .if ${MK_SENDMAIL} != "no"
> -FILESGROUPS+=SENDMAILRC
> -SENDMAILRC=rc.sendmail
> +BIN1+=rc.sendmail
> .endif
> -SENDMAILRCDIR=/etc
> -SENDMAILRCMODE=${BINMODE}
> -SENDMAILRCPACKAGE=sendmail
>
> .if ${MK_TCSH} != "no"
> BIN1+= csh.cshrc csh.login csh.logout
>
> Modified: head/etc/devd/Makefile
> ==
> --- head/etc/devd/MakefileSun Apr 17 02:51:04 2016(r298139)
> +++ head/etc/devd/MakefileSun Apr 17 03:45:45 2016(r298140)
> @@ -10,12 +10,7 @@ FILES+=apple.conf
>
> .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
> .if ${MK_ACPI} != "no"
> -FILESGROUPS+=ACPI
> -ACPI=asus.conf
> -ACPIPACKAGE=acpi
> -ACPIDIR=/etc/devd
> -ACPITAGS=config
> -ACPIMODE=644
> +FILES+=asus.conf
> .endif
> .if ${MK_HYPERV} != "no"
> FILES+=hyperv.conf
>
___
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"
svn commit: r298140 - in head/etc: . devd
Author: gjb
Date: Sun Apr 17 03:45:45 2016
New Revision: 298140
URL: https://svnweb.freebsd.org/changeset/base/298140
Log:
Fix etcupdate(8) with rc.sendmail and devd/*. It turns out
BIN1 and such in etc/* cannot use FILESGROUPS.
Reported by: peter
Sponsored by: The FreeBSD Foundation
Modified:
head/etc/Makefile
head/etc/devd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sun Apr 17 02:51:04 2016(r298139)
+++ head/etc/Makefile Sun Apr 17 03:45:45 2016(r298140)
@@ -83,13 +83,8 @@ BIN1+= apmd.conf
.endif
.if ${MK_AUTOFS} != "no"
-FILESGROUPS+= AUTOFS
-AUTOFS+= auto_master
+BIN1+= auto_master
.endif
-AUTOFSDIR= /etc
-AUTOFSMODE=${BINMODE}
-AUTOFSPACKAGE= autofs
-AUTOFSTAGS=config
.if ${MK_FREEBSD_UPDATE} != "no"
BIN1+= freebsd-update.conf
@@ -141,12 +136,8 @@ BIN1+= pf.os
.endif
.if ${MK_SENDMAIL} != "no"
-FILESGROUPS+= SENDMAILRC
-SENDMAILRC=rc.sendmail
+BIN1+= rc.sendmail
.endif
-SENDMAILRCDIR= /etc
-SENDMAILRCMODE=${BINMODE}
-SENDMAILRCPACKAGE=sendmail
.if ${MK_TCSH} != "no"
BIN1+= csh.cshrc csh.login csh.logout
Modified: head/etc/devd/Makefile
==
--- head/etc/devd/Makefile Sun Apr 17 02:51:04 2016(r298139)
+++ head/etc/devd/Makefile Sun Apr 17 03:45:45 2016(r298140)
@@ -10,12 +10,7 @@ FILES+= apple.conf
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
.if ${MK_ACPI} != "no"
-FILESGROUPS+= ACPI
-ACPI= asus.conf
-ACPIPACKAGE= acpi
-ACPIDIR= /etc/devd
-ACPITAGS= config
-ACPIMODE= 644
+FILES+=asus.conf
.endif
.if ${MK_HYPERV} != "no"
FILES+=hyperv.conf
___
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"
