Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Apr 2016 21:01:04 -0700
From:      NGie Cooper <yaneurabeya@gmail.com>
To:        Glen Barber <gjb@FreeBSD.org>
Cc:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r298140 - in head/etc: . devd
Message-ID:  <F3ECF357-357E-486E-A864-6AEAD6596E6D@gmail.com>
In-Reply-To: <201604170345.u3H3jjro051727@repo.freebsd.org>
References:  <201604170345.u3H3jjro051727@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help

> On Apr 16, 2016, at 20:45, Glen Barber <gjb@FreeBSD.org> wrote:
>=20
> Author: gjb
> Date: Sun Apr 17 03:45:45 2016
> New Revision: 298140
> URL: https://svnweb.freebsd.org/changeset/base/298140
>=20
> Log:
>  Fix etcupdate(8) with rc.sendmail and devd/*.  It turns out
>  BIN1 and such in etc/* cannot use FILESGROUPS.
>=20
>  Reported by:    peter
>  Sponsored by:    The FreeBSD Foundation

This only applies to etc/Makefile . I offered to change that a couple years a=
go and it was met with a large number of complaints and some teeth gnashing.=

> Modified:
>  head/etc/Makefile
>  head/etc/devd/Makefile
>=20
> Modified: head/etc/Makefile
> =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/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+=3D apmd.conf
> .endif
>=20
> .if ${MK_AUTOFS} !=3D "no"
> -FILESGROUPS+=3D    AUTOFS
> -AUTOFS+=3D    auto_master
> +BIN1+=3D    auto_master
> .endif
> -AUTOFSDIR=3D    /etc
> -AUTOFSMODE=3D    ${BINMODE}
> -AUTOFSPACKAGE=3D    autofs
> -AUTOFSTAGS=3D    config
>=20
> .if ${MK_FREEBSD_UPDATE} !=3D "no"
> BIN1+=3D freebsd-update.conf
> @@ -141,12 +136,8 @@ BIN1+=3D pf.os
> .endif
>=20
> .if ${MK_SENDMAIL} !=3D "no"
> -FILESGROUPS+=3D    SENDMAILRC
> -SENDMAILRC=3D    rc.sendmail
> +BIN1+=3D    rc.sendmail
> .endif
> -SENDMAILRCDIR=3D    /etc
> -SENDMAILRCMODE=3D    ${BINMODE}
> -SENDMAILRCPACKAGE=3Dsendmail
>=20
> .if ${MK_TCSH} !=3D "no"
> BIN1+=3D csh.cshrc csh.login csh.logout
>=20
> Modified: head/etc/devd/Makefile
> =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/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+=3D    apple.conf
>=20
> .if ${MACHINE} =3D=3D "amd64" || ${MACHINE} =3D=3D "i386"
> .if ${MK_ACPI} !=3D "no"
> -FILESGROUPS+=3D    ACPI
> -ACPI=3D    asus.conf
> -ACPIPACKAGE=3D    acpi
> -ACPIDIR=3D    /etc/devd
> -ACPITAGS=3D    config
> -ACPIMODE=3D    644
> +FILES+=3D    asus.conf
> .endif
> .if ${MK_HYPERV} !=3D "no"
> FILES+=3D    hyperv.conf
>=20



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?F3ECF357-357E-486E-A864-6AEAD6596E6D>