1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 03:53:41 +00:00
nixpkgs/pkgs/servers/samba/4.x-no-persistent-install.patch
Aneesh Agrawal 85d16a33ec samba: 4.7.10 -> 4.10.2
Release notes: https://www.samba.org/samba/history/samba-4.10.2.html
Notably, Samba 4.10.0 is the first with Python 3 support,
and the 4.10 line will be the last supporting Python 2,
so switch to Python 3.

Add myself as a maintainer.
2019-04-13 10:31:07 -07:00

40 lines
1.7 KiB
Diff

--- a/ctdb/wscript 2019-01-15 02:07:00.000000000 -0800
+++ b/ctdb/wscript 2019-01-20 20:21:08.800187459 -0800
@@ -814,7 +814,7 @@
for t in etc_subdirs:
files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
for fmode in files:
- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
# If this is a direct install and there are no event scripts
@@ -852,24 +852,20 @@
]
for t in etc_scripts:
- bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
destname=t, chmod=MODE_755)
bld.SAMBA_GENERATOR('ctdb-sudoers',
source='config/ctdb.sudoers',
target='ctdb.sudoers',
rule='sed %s ${SRC} > ${TGT}' % (sed_cmdline))
- bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
+ bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'ctdb.sudoers',
destname='ctdb')
- bld.INSTALL_FILES('${CTDB_ETCDIR}/events/notification',
+ bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/events/notification',
'config/notification.README',
destname='README')
- bld.INSTALL_DIR(bld.env.CTDB_LOGDIR)
- bld.INSTALL_DIR(bld.env.CTDB_RUNDIR)
- bld.INSTALL_DIR(bld.env.CTDB_VARDIR)
-
for d in ['volatile', 'persistent', 'state']:
bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))