mirror of
https://github.com/samba-team/samba.git
synced 2025-01-08 21:18:16 +03:00
s4-build Change default paths and --with flags for a 4.0 release
The following changes are made since Samba 3.6: * --with-ncalrpcdir and --with-nmbdsocketdir are replaced with --with-socket-dir (with ntp_signd, winbindd, nmbd subdirs) * This moves the winbind socket out of /tmp. Distributions have moved this out of /tmp for quite some time now, and /var/run in the FHS blessed location these days. --with-socketdir should point to /var/run in a distribution package. * Configuration files are expected in PREFIX/etc instead of PREFIX/lib (they need to be moved manually) * SWAT data files have moved to PREFIX/share/swat (alongside PREFIX/share/setup containing samba4 provision templates). * The --with-fhs option is no longer available (it was never very useful, and major distributions (Debian, OpenSuSE, Fedora) either specified every option (overriding the effect) or didn't specify it at all. * PID files are now in PREFIX/var/run, moved from PREFIX/var/locks * The ncalrpc and nmbd sockets are now in PREFIX/var/run by default The following changes are made for users of Samba3 binaries built with the top level build in master * 'state' files are now expected to be in their Samba 3.6 location PREFIX/var/locks (and will need to be moved manually) Andrew Bartlett Signed-off-by: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett
parent
01ce078ed1
commit
edd3e8b03a
@ -5,12 +5,15 @@ from samba_utils import EXPAND_VARIABLES, os_path_relpath
|
||||
|
||||
# list of directory options to offer in configure
|
||||
dir_options = {
|
||||
'with-piddir' : [ '${PREFIX}/var/run', 'where to put pid files' ],
|
||||
'with-piddir' : [ '${LOCALSTATEDIR}/run', 'where to put pid files' ],
|
||||
'with-privatedir' : [ '${PREFIX}/private', 'Where to put sam.ldb and other private files' ],
|
||||
'with-winbindd-socket-dir' : [ '${PREFIX}/var/lib/winbindd', 'winbind socket directory' ],
|
||||
'with-winbindd-privileged-socket-dir' : [ '${PREFIX}/var/lib/winbindd_privileged', 'winbind privileged socket directory'],
|
||||
'with-ntp-signd-socket-dir' : [ '${PREFIX}/var/run/ntp_signd', 'NTP signed directory'],
|
||||
'with-lockdir' : [ '${PREFIX}/var/locks', 'where to put lock files' ]
|
||||
'with-sockets-dir' : [ '${LOCALSTATEDIR}/run', 'sockets directory' ],
|
||||
'with-winbindd-privileged-socket-dir' : [ '${LOCALSTATEDIR}/lib/winbindd_privileged', 'winbind privileged socket directory'],
|
||||
'with-lockdir' : [ '${LOCALSTATEDIR}/locks', 'where to put short term disposable state files' ],
|
||||
'with-cachedir' : [ '${LOCALSTATEDIR}/locks', 'where to put cache files' ],
|
||||
'with-logfilebase' : [ '${LOCALSTATEDIR}', 'Where to put log files' ],
|
||||
'with-pammodulesdir' : [ '${LIBDIR}', 'Which directory to use for PAM modules' ],
|
||||
'with-statedir' : [ '${LOCALSTATEDIR}/locks', 'where to put persistent state files' ],
|
||||
}
|
||||
|
||||
# list of cflags to use for dynconfig.c
|
||||
@ -22,56 +25,30 @@ dyn_cflags = {
|
||||
'CONFIGFILE' : '${SYSCONFDIR}/smb.conf',
|
||||
'LMHOSTSFILE' : '${SYSCONFDIR}/lmhosts',
|
||||
'PRIVATE_DIR' : '${PRIVATEDIR}',
|
||||
'LOGFILEBASE' : '${LOCALSTATEDIR}',
|
||||
'LOCKDIR' : '${LOCALSTATEDIR}/locks',
|
||||
'PIDDIR' : '${LOCALSTATEDIR}/run',
|
||||
'LOGFILEBASE' : '${LOGFILEBASE}',
|
||||
'LOCKDIR' : '${LOCKDIR}',
|
||||
'PIDDIR' : '${PIDDIR}',
|
||||
'DATADIR' : '${DATADIR}',
|
||||
'LOCALEDIR' : '${LOCALEDIR}',
|
||||
'SETUPDIR' : '${DATADIR}/setup',
|
||||
'WINBINDD_SOCKET_DIR' : '${WINBINDD_SOCKET_DIR}',
|
||||
'WINBINDD_SOCKET_DIR' : '${SOCKETS_DIR}/winbindd',
|
||||
'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${WINBINDD_PRIVILEGED_SOCKET_DIR}',
|
||||
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
|
||||
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
|
||||
'NTP_SIGND_SOCKET_DIR' : '${SOCKETS_DIR}/ntp_signd',
|
||||
'NCALRPCDIR' : '${SOCKETS_DIR}/ncalrpc',
|
||||
'PYTHONDIR' : '${PYTHONDIR}',
|
||||
'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
|
||||
'MODULESDIR' : '${PREFIX}/modules',
|
||||
'INCLUDEDIR' : '${PREFIX}/include',
|
||||
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
|
||||
'SWATDIR' : '${DATADIR}/swat',
|
||||
'CODEPAGEDIR' : '${LIBDIR}/samba',
|
||||
'CODEPAGEDIR' : '${DATADIR}/codepages',
|
||||
'LIBDIR' : '${LIBDIR}',
|
||||
'LIBEXECDIR' : '${MODULESDIR}',
|
||||
'STATEDIR' : '${LOCALSTATEDIR}',
|
||||
'CACHEDIR' : '${LOCKDIR}',
|
||||
'LIBEXECDIR' : '${LIBEXECDIR}',
|
||||
'STATEDIR' : '${STATEDIR}',
|
||||
'CACHEDIR' : '${CACHEDIR}',
|
||||
'SMB_PASSWD_FILE' : '${PRIVATEDIR}/smbpasswd',
|
||||
'NMBDSOCKETDIR' : '${LOCALSTATEDIR}/nmbd',
|
||||
}
|
||||
|
||||
# changes for when FHS is enabled
|
||||
dyn_cflags_fhs = {
|
||||
'BINDIR' : '${BINDIR}',
|
||||
'SBINDIR' : '${SBINDIR}',
|
||||
'SCRIPTSBINDIR' : '${SBINDIR}',
|
||||
'CONFIGDIR' : '${SYSCONFDIR}/samba',
|
||||
'CONFIGFILE' : '${SYSCONFDIR}/samba/smb.conf',
|
||||
'LMHOSTSFILE' : '${SYSCONFDIR}/samba/lmhosts',
|
||||
'PRIVATE_DIR' : '${LOCALSTATEDIR}/lib/samba/private',
|
||||
'LOGFILEBASE' : '${LOCALSTATEDIR}/log/samba',
|
||||
'LOCKDIR' : '${LOCALSTATEDIR}/lib/samba',
|
||||
'PIDDIR' : '${LOCALSTATEDIR}/run/samba',
|
||||
'SETUPDIR' : '${DATADIR}/samba/setup',
|
||||
'WINBINDD_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd',
|
||||
'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
|
||||
'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd',
|
||||
'NCALRPCDIR' : '${LOCALSTATEDIR}/run/samba/ncalrpc',
|
||||
'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
|
||||
'MODULESDIR' : '${LIBDIR}/samba',
|
||||
'LIBEXECDIR' : '${MODULESDIR}',
|
||||
'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',
|
||||
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
|
||||
'SWATDIR' : '${DATADIR}/swat',
|
||||
'CODEPAGEDIR' : '${DATADIR}/samba',
|
||||
'NMBDSOCKETDIR' : '${LOCALSTATEDIR}/run/samba/nmbd',
|
||||
'NMBDSOCKETDIR' : '${SOCKETS_DIR}/nmbd',
|
||||
'PAMMODULESDIR' : '${PAMMODULESDIR}',
|
||||
}
|
||||
|
||||
def get_varname(v):
|
||||
@ -85,9 +62,6 @@ def get_varname(v):
|
||||
|
||||
def set_options(opt):
|
||||
# get all the basic GNU options from the gnu_dirs tool
|
||||
opt.add_option('--enable-fhs',
|
||||
help=("Use FHS-compliant paths (default no)"),
|
||||
action="store_true", dest='ENABLE_FHS', default=False)
|
||||
for option in dir_options.keys():
|
||||
default = dir_options[option][0]
|
||||
help = dir_options[option][1]
|
||||
@ -110,18 +84,6 @@ def configure(conf):
|
||||
conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
|
||||
conf.env[f] = v
|
||||
|
||||
if Options.options.ENABLE_FHS:
|
||||
for f in dyn_cflags_fhs.keys():
|
||||
v = EXPAND_VARIABLES(conf, dyn_cflags_fhs[f])
|
||||
conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
|
||||
conf.env[f] = v
|
||||
|
||||
if (not Options.options.ENABLE_FHS and
|
||||
(conf.env.PREFIX == '/usr' or conf.env.PREFIX == '/usr/local')):
|
||||
print("ERROR: Don't install directly under /usr or /usr/local without using the FHS option (--enable-fhs)")
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def dynconfig_cflags(bld, list=None):
|
||||
'''work out the extra CFLAGS for dynconfig.c'''
|
||||
cflags = []
|
||||
|
||||
@ -125,6 +125,6 @@ bld.RECURSE('source3')
|
||||
bld.RECURSE('testsuite/headers')
|
||||
|
||||
# install some extra empty directories
|
||||
bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging")
|
||||
bld.INSTALL_DIRS("", "${LOCKDIR} ${STATEDIR} ${CACHEDIR} ${SWATDIR} ${SYSCONFDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging ${CODEPAGEDIR} ${LOGFILEBASE} ${SETUPDIR}")
|
||||
|
||||
bld.SYMBOL_CHECK()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user