1. Add much finer granularity to the NO_BIND knobs with the addition of:
NO_BIND_DNSSEC, NO_BIND_ETC, NO_BIND_NAMED, and NO_BIND_UTILS. 2. Make creation of directories in /usr/include that are only needed in the WITH_BIND_LIBS case conditional. Reviewed by: ru, des
This commit is contained in:
parent
8b7a7341b3
commit
2a61444749
@ -270,6 +270,10 @@ _worldtmp:
|
||||
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
|
||||
-p ${WORLDTMP}/usr/include >/dev/null
|
||||
ln -sf ${.CURDIR}/sys ${WORLDTMP}
|
||||
.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
|
||||
mtree -deU -f ${.CURDIR}/etc/mtree/BIND.include.dist \
|
||||
-p ${WORLDTMP}/usr/include >/dev/null
|
||||
.endif
|
||||
_legacy:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------"
|
||||
|
14
etc/Makefile
14
etc/Makefile
@ -40,9 +40,17 @@ MTREE= BSD.include.dist BSD.local.dist BSD.root.dist BSD.usr.dist \
|
||||
.if !defined(NO_SENDMAIL)
|
||||
MTREE+= BSD.sendmail.dist
|
||||
.endif
|
||||
.if !defined(NO_BIND)
|
||||
MTREE+= BIND.chroot.dist
|
||||
.if defined(WITH_BIND_LIBS)
|
||||
MTREE+= BIND.include.dist
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
|
||||
NAMEDB= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \
|
||||
make-localhost
|
||||
.endif
|
||||
|
||||
PPPCNF= ppp.conf
|
||||
|
||||
@ -114,8 +122,10 @@ distribution:
|
||||
ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
|
||||
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
|
||||
${MTREE} ${DESTDIR}/etc/mtree
|
||||
.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
|
||||
cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
${NAMEDB} ${DESTDIR}/etc/namedb
|
||||
.endif
|
||||
cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
|
||||
${PPPCNF} ${DESTDIR}/etc/ppp
|
||||
cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
|
||||
@ -171,6 +181,10 @@ distrib-dirs:
|
||||
-p ${DESTDIR}/usr/include
|
||||
.if !defined(NO_SENDMAIL)
|
||||
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
|
||||
.endif
|
||||
.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
|
||||
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
|
||||
-p ${DESTDIR}/usr/include
|
||||
.endif
|
||||
cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
|
||||
cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
|
||||
|
@ -98,6 +98,11 @@ compat:
|
||||
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
|
||||
-f ${.CURDIR}/../etc/mtree/BSD.include.dist \
|
||||
-p ${DESTDIR}${INCLUDEDIR}
|
||||
.if defined(WITH_BIND_LIBS) && !defined(NO_BIND)
|
||||
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} \
|
||||
-f ${.CURDIR}/../etc/mtree/BIND.include.dist \
|
||||
-p ${DESTDIR}${INCLUDEDIR}
|
||||
.endif
|
||||
|
||||
copies:
|
||||
.for i in ${LDIRS} ${LSUBDIRS} crypto machine machine/pc
|
||||
|
@ -146,7 +146,11 @@
|
||||
# Variables to control whether parts of the base BIND are built.
|
||||
# Defining NO_BIND makes all of the following BIND variables obsolete.
|
||||
#NO_BIND= true # Do not build any part of BIND
|
||||
#NO_BIND_DNSSEC= true # Do not build dnssec-keygen, dnssec-signzone
|
||||
#NO_BIND_ETC= true # Do not install files to /etc/namedb
|
||||
#NO_BIND_LIBS_LWRES= true # Do not install the lwres library
|
||||
#NO_BIND_NAMED= true # Do not build named, rndc, lwresd, etc.
|
||||
#NO_BIND_UTILS= true # Do not build dig, host, nslookup, nsupdate
|
||||
#WITH_BIND_LIBS= true # Install the BIND libs and include files
|
||||
#
|
||||
# To build sys/modules when building the world (our old way of doing things)
|
||||
|
@ -24,7 +24,7 @@
|
||||
.\"
|
||||
.\" $FreeBSD$
|
||||
.\"
|
||||
.Dd September 25, 2004
|
||||
.Dd September 27, 2004
|
||||
.Dt MAKE.CONF 5
|
||||
.Os
|
||||
.Sh NAME
|
||||
@ -603,11 +603,39 @@ subdir.
|
||||
.Pq Vt bool
|
||||
Setting this variable will prevent any part of BIND from being built,
|
||||
regardless of the presence of any of the other *_BIND_* variables below.
|
||||
.It Va NO_BIND_DNSSEC
|
||||
.Pq Vt bool
|
||||
Set to avoid building or installing the DNSSEC related binaries,
|
||||
.Xr dnssec-keygen 8
|
||||
and
|
||||
.Xr dnssec-signzone 8 .
|
||||
.It Va NO_BIND_ETC
|
||||
.Pq Vt bool
|
||||
Set to avoid installing the default files to
|
||||
.Pa /etc/namedb .
|
||||
.It Va NO_BIND_LIBS_LWRES
|
||||
.Pq Vt bool
|
||||
Set to avoid installing the lwres library in
|
||||
Set to avoid installing the lightweight resolver library in
|
||||
.Pa /usr/lib .
|
||||
The library that is private to the build system may still be built as needed.
|
||||
.It Va NO_BIND_NAMED
|
||||
.Pq Vt bool
|
||||
Set to avoid building or installing
|
||||
.Xr named 8 ,
|
||||
.Xr named.reload 8 ,
|
||||
.Xr named-checkconf 8 ,
|
||||
.Xr named-checkzone 8 ,
|
||||
.Xr rndc 8 ,
|
||||
and
|
||||
.Xr rndc-confgen 8 .
|
||||
.It Va NO_BIND_UTILS
|
||||
.Pq Vt bool
|
||||
Set to avoid building or installing the BIND userland utilities,
|
||||
.Xr dig 1 ,
|
||||
.Xr host 1 ,
|
||||
.Xr nslookup 1 ,
|
||||
and
|
||||
.Xr nsupdate 8 .
|
||||
.It Va WITH_BIND_LIBS
|
||||
.Pq Vt bool
|
||||
Set to install BIND libraries and include files.
|
||||
|
@ -234,7 +234,7 @@ _truss= truss
|
||||
#_atm= atm
|
||||
.endif
|
||||
|
||||
.if !defined(NO_BIND)
|
||||
.if !defined(NO_BIND) && !defined(NO_BIND_UTILS)
|
||||
_dig= dig
|
||||
_host= host
|
||||
_nslookup= nslookup
|
||||
|
@ -193,10 +193,11 @@ _atm= atm
|
||||
.endif
|
||||
|
||||
.if !defined(NO_BIND)
|
||||
.if !defined(NOCRYPT)
|
||||
.if !defined(NO_BIND_DNSSEC) && !defined(NOCRYPT)
|
||||
_dnssec-keygen= dnssec-keygen
|
||||
_dnssec-signzone= dnssec-signzone
|
||||
.endif
|
||||
.if !defined(NO_BIND_NAMED)
|
||||
_named= named
|
||||
_named.reload= named.reload
|
||||
_named-checkconf= named-checkconf
|
||||
@ -204,6 +205,7 @@ _named-checkzone= named-checkzone
|
||||
_rndc= rndc
|
||||
_rndc-confgen= rndc-confgen
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined(NO_BLUETOOTH)
|
||||
_bluetooth= bluetooth
|
||||
|
Loading…
Reference in New Issue
Block a user