diff options
author | sam <sam@FreeBSD.org> | 2008-09-21 22:02:26 +0000 |
---|---|---|
committer | sam <sam@FreeBSD.org> | 2008-09-21 22:02:26 +0000 |
commit | 9c3d2ffcdff40754b2207eb84c1ff0843e225c71 (patch) | |
tree | 6d0176f734c952569004dea8a4d84a092ced5821 /etc/periodic | |
parent | 89ba9c24eeac9215b911c9d51e34a31bac0315de (diff) | |
download | FreeBSD-src-9c3d2ffcdff40754b2207eb84c1ff0843e225c71.zip FreeBSD-src-9c3d2ffcdff40754b2207eb84c1ff0843e225c71.tar.gz |
add new build knobs and jigger some existing controls to improve
control over the result of buildworld and installworld; this especially
helps packaging systems such as nanobsd
Reviewed by: various (posted to arch)
MFC after: 1 month
Diffstat (limited to 'etc/periodic')
-rw-r--r-- | etc/periodic/daily/Makefile | 49 | ||||
-rw-r--r-- | etc/periodic/monthly/Makefile | 11 | ||||
-rw-r--r-- | etc/periodic/security/Makefile | 21 | ||||
-rw-r--r-- | etc/periodic/weekly/Makefile | 22 |
4 files changed, 80 insertions, 23 deletions
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile index 5e25f90..80583a1 100644 --- a/etc/periodic/daily/Makefile +++ b/etc/periodic/daily/Makefile @@ -1,15 +1,11 @@ # $FreeBSD$ +.include <bsd.own.mk> + FILES= 100.clean-disks \ 110.clean-tmps \ 120.clean-preserve \ - 130.clean-msgs \ - 140.clean-rwho \ - 150.clean-hoststat \ 200.backup-passwd \ - 210.backup-aliases \ - 300.calendar \ - 310.accounting \ 330.news \ 400.status-disks \ 404.status-zfs \ @@ -19,13 +15,42 @@ FILES= 100.clean-disks \ 408.status-gstripe \ 409.status-gconcat \ 420.status-network \ - 430.status-rwho \ - 440.status-mailq \ 450.status-security \ - 460.status-mail-rejects \ - 470.status-named \ - 480.status-ntpd \ - 500.queuerun \ 999.local +# NB: keep these sorted by MK_* knobs + +.if ${MK_ACCT} != "no" +FILES+= 310.accounting +.endif + +.if ${MK_BIND_NAMED} != "no" +FILES+= 470.status-named +.endif + +.if ${MK_CALENDAR} != "no" +FILES+= 300.calendar +.endif + +.if ${MK_MAIL} != "no" +FILES+= 130.clean-msgs +.endif + +.if ${MK_NTP} != "no" +FILES+= 480.status-ntpd +.endif + +.if ${MK_RCMDS} != "no" +FILES+= 140.clean-rwho \ + 430.status-rwho +.endif + +.if ${MK_SENDMAIL} != "no" +FILES+= 150.clean-hoststat \ + 210.backup-aliases \ + 440.status-mailq \ + 460.status-mail-rejects \ + 500.queuerun +.endif + .include <bsd.prog.mk> diff --git a/etc/periodic/monthly/Makefile b/etc/periodic/monthly/Makefile index c213230..1e71afd 100644 --- a/etc/periodic/monthly/Makefile +++ b/etc/periodic/monthly/Makefile @@ -1,6 +1,13 @@ # $FreeBSD$ -FILES= 200.accounting \ - 999.local +.include <bsd.own.mk> + +FILES= 999.local + +# NB: keep these sorted by MK_* knobs + +.if ${MK_ACCT} != "no" +FILES+= 200.accounting +.endif .include <bsd.prog.mk> diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile index c7a9b2b..e1d6dfd 100644 --- a/etc/periodic/security/Makefile +++ b/etc/periodic/security/Makefile @@ -1,17 +1,30 @@ # $FreeBSD$ +.include <bsd.own.mk> + FILES= 100.chksetuid \ 200.chkmounts \ 300.chkuid0 \ 400.passwdless \ 410.logincheck \ - 500.ipfwdenied \ - 510.ipfdenied \ - 520.pfdenied \ - 550.ipfwlimit \ 700.kernelmsg \ 800.loginfail \ 900.tcpwrap \ security.functions +# NB: keep these sorted by MK_* knobs + +.if ${MK_IPFILTER} != "no" +FILES+= 510.ipfdenied +.endif + +.if ${MK_IPFW} != "no" +FILES+= 500.ipfwdenied \ + 550.ipfwlimit +.endif + +.if ${MK_PF} != "no" +FILES+= 520.pfdenied +.endif + .include <bsd.prog.mk> diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile index bc97fa9..463520f 100644 --- a/etc/periodic/weekly/Makefile +++ b/etc/periodic/weekly/Makefile @@ -1,10 +1,22 @@ # $FreeBSD$ -FILES= 310.locate \ - 320.whatis \ - 330.catman \ - 340.noid \ - 400.status-pkg \ +.include <bsd.own.mk> + +FILES= 340.noid \ 999.local +# NB: keep these sorted by MK_* knobs + +.if ${MK_LOCATE} != "no" +FILES+= 310.locate +.endif + +.if ${MK_MAN} != "no" +FILES+= 320.whatis 330.catman +.endif + +.if ${MK_PKGTOOLS} != "no" +FLES+= 400.status-pkg +.endif + .include <bsd.prog.mk> |