diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 23 | ||||
| -rw-r--r-- | etc/mail/Makefile | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.include.dist | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.lib32.dist | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.root.dist | 104 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 22 | ||||
| -rw-r--r-- | etc/mtree/BSD.var.dist | 6 |
8 files changed, 92 insertions, 75 deletions
diff --git a/etc/Makefile b/etc/Makefile index ab799b2f6c80..bda70b8af391 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -64,9 +64,12 @@ distribution: ${INSTALL_SYMLINK} -T "package=runtime" ../var/run/os-release \ ${DESTDIR}/etc/os-release .if ${MK_UNBOUND} != "no" - if [ ! -e ${DESTDIR}/etc/unbound ]; then \ - ${INSTALL_SYMLINK} -T "package=unbound" \ - ../var/unbound ${DESTDIR}/etc/unbound; \ +# If NO_ROOT is defined, we are doing a stage install and always need to +# install the /etc/unbound symlink, otherwise, don't overwrite the user's +# existing symlink. + if [ "${NO_ROOT:Dtrue}" = true -o ! -e ${DESTDIR}/etc/unbound ]; then \ + ${INSTALL_SYMLINK} -Tpackage=local-unbound ../var/unbound \ + ${DESTDIR}/etc/unbound; \ fi .endif .if ${MK_SENDMAIL} != "no" @@ -82,12 +85,16 @@ distribution: .if ${MK_MAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ -T "package=runtime,config" ${ETCMAIL} ${DESTDIR}/etc/mail - if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \ - ! -f ${DESTDIR}/etc/aliases ]; then \ - ${INSTALL_SYMLINK} -T "package=runtime" \ - mail/aliases ${DESTDIR}/etc/aliases; \ +# If NO_ROOT is defined, we are doing a stage install and always need to +# install the /etc/aliases symlink, otherwise, don't overwrite the user's +# existing symlink. + if [ "${NO_ROOT:Dtrue}" = true -o \( -f ${DESTDIR}/etc/mail/aliases -a \ + ! -f ${DESTDIR}/etc/aliases \) ]; then \ + ${INSTALL_SYMLINK} -Tpackage=runtime mail/aliases \ + ${DESTDIR}/etc/aliases; \ fi -.endif +.endif # ${MK_MAIL} != "no" + .if ${MK_SENDMAIL} != "no" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ -T "package=sendmail" ${ETCMAIL_SENDMAIL} ${DESTDIR}/etc/mail diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 784023d6f9c0..9b03047102ea 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -241,5 +241,7 @@ restart restart-mta restart-mspq: .include "Makefile.local" .endif -# For the definition of $SHAREMODE +# For the definition of $SHAREMODE. Define _WITHOUT_SRCCONF to prevent this +# including <bsd.compiler.mk>, which requires clang. +_WITHOUT_SRCCONF=yes .include <bsd.own.mk> diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 28c4d91ac1c0..454657183c58 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -276,9 +276,7 @@ .. kadm5 .. - kdb5 - .. - krb5 + krb5 tags=package=kerberos-dev .. lib80211 .. diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist index a736a7d58b66..6520b7b95116 100644 --- a/etc/mtree/BSD.lib32.dist +++ b/etc/mtree/BSD.lib32.dist @@ -21,5 +21,7 @@ .. pkgconfig .. + virtual_oss + .. .. .. diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 1312251cdd9e..95a3361b3c61 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -4,8 +4,9 @@ /set type=dir uname=root gname=wheel mode=0755 . - bin + bin tags=package=runtime .. +/set tags=package=bootloader boot defaults .. @@ -27,7 +28,7 @@ .. kernel .. - loader.conf.d tags=package=bootloader + loader.conf.d .. lua .. @@ -38,108 +39,109 @@ zfs .. .. +/unset tags dev mode=0555 tags=package=runtime .. - etc - X11 + etc tags=package=runtime + X11 tags=package=runtime .. - authpf + authpf tags=package=pf .. - autofs + autofs tags=package=autofs .. - bluetooth + bluetooth tags=package=bluetooth .. - cron.d + cron.d tags=package=cron .. - defaults + defaults tags=package=runtime .. - devd + devd tags=package=devd .. - dma + dma tags=package=dma .. - gss + gss tags=package=runtime .. - jail.conf.d + jail.conf.d tags=package=jail .. kyua tags=package=tests .. - mail + mail tags=package=runtime .. - mtree + mtree tags=package=mtree .. - newsyslog.conf.d + newsyslog.conf.d tags=package=newsyslog .. - ntp mode=0700 + ntp mode=0700 tags=package=ntp .. - pam.d + pam.d tags=package=runtime .. - periodic - daily + periodic tags=package=periodic + daily tags=package=periodic .. - monthly + monthly tags=package=periodic .. - security + security tags=package=periodic .. - weekly + weekly tags=package=periodic .. .. - pkg + pkg tags=package=pkg-bootstrap .. - ppp + ppp tags=package=ppp .. - profile.d + profile.d tags=package=runtime .. - rc.conf.d + rc.conf.d tags=package=rc .. - rc.d + rc.d tags=package=rc .. - security + security tags=package=audit .. - ssh + ssh tags=package=ssh .. - ssl - certs + ssl tags=package=caroot + certs tags=package=caroot .. - untrusted + untrusted tags=package=caroot .. .. - sysctl.kld.d + sysctl.kld.d tags=package=runtime .. - syslog.d + syslog.d tags=package=syslogd .. - zfs - compatibility.d + zfs tags=package=zfs + compatibility.d tags=package=zfs .. .. .. - lib - geom + lib tags=package=clibs + geom tags=package=geom .. - nvmecontrol + nvmecontrol tags=package=nvme-tools .. .. - libexec - resolvconf + libexec tags=package=clibs + resolvconf tags=package=resolvconf .. .. - media + media tags=package=runtime .. - mnt + mnt tags=package=runtime .. - net + net tags=package=autofs .. - proc mode=0555 + proc mode=0555 tags=package=runtime .. - rescue + rescue tags=package=rescue .. - root mode=0750 + root mode=0750 tags=package=runtime .. - sbin + sbin tags=package=runtime .. tmp mode=01777 tags=package=runtime .. - usr + usr tags=package=runtime .. - var + var tags=package=runtime .. .. diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 2c25d9386032..e6a013f010de 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1255,6 +1255,8 @@ .. .. usr.sbin + certctl + .. chown .. ctladm diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 68977a6b8282..6a8c155e5e73 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -26,6 +26,8 @@ .. .. .. + samplerate + .. sqlite3 .. ucl @@ -83,15 +85,15 @@ .. i18n .. - krb5 - kdb + krb5 tags=package=kerberos-kdc + kdb tags=package=kerberos-kdc .. - plugins - kdb + plugins tags=package=kerberos-kdc + kdb tags=package=kerberos-kdc .. - preauth + preauth tags=package=kerberos-kdc .. - tls + tls tags=package=kerberos-kdc .. .. .. @@ -101,6 +103,8 @@ .. ossl-modules .. + virtual_oss + .. .. libdata ldscripts @@ -177,8 +181,6 @@ .. hyperv .. - kgdb - .. lpr ru .. @@ -267,6 +269,8 @@ .. dtrace .. + et tags=package=kerberos-dev + .. examples BSD_daemon .. @@ -284,8 +288,6 @@ .. dma .. - drivers - .. dwatch .. etc diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist index 0845d8a59f65..b55c0150848e 100644 --- a/etc/mtree/BSD.var.dist +++ b/etc/mtree/BSD.var.dist @@ -45,6 +45,8 @@ .. ipf mode=0700 tags=package=ipf .. + krb5kdc mode=0700 tags=package=kerberos-kdc + .. mtree .. ntp uname=ntpd gname=ntpd @@ -102,8 +104,8 @@ vi.recover mode=01777 .. .. - unbound uname=unbound gname=unbound mode=0755 tags=package=unbound - conf.d uname=unbound gname=unbound mode=0755 tags=package=unbound + unbound uname=unbound gname=unbound mode=0755 tags=package=local-unbound + conf.d uname=unbound gname=unbound mode=0755 tags=package=local-unbound .. .. yp |