Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-12017 ldlm: DoM truncate deadlock
[fs/lustre-release.git]
/
lustre
/
scripts
/
Makefile.am
diff --git
a/lustre/scripts/Makefile.am
b/lustre/scripts/Makefile.am
index
11d8be7
..
f834235
100644
(file)
--- a/
lustre/scripts/Makefile.am
+++ b/
lustre/scripts/Makefile.am
@@
-15,11
+15,7
@@
#
# You should have received a copy of the GNU General Public License
# version 2 along with this program; If not, see
#
# You should have received a copy of the GNU General Public License
# version 2 along with this program; If not, see
-# http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
-#
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# http://www.gnu.org/licenses/gpl-2.0.html
#
# GPL HEADER END
#
#
# GPL HEADER END
#
@@
-28,7
+24,7
@@
# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
# Use is subject to license terms.
#
-# Copyright (c) 2013, 201
4
, Intel Corporation.
+# Copyright (c) 2013, 201
5
, Intel Corporation.
#
#
#
#
@@
-37,15
+33,25
@@
#
# These are scripts that are generated from .in files
#
# These are scripts that are generated from .in files
-genscripts = lc_modprobe lc_net lc_hb lc_cluman lc_md lc_lvm lustre_start
+genscripts = lc_modprobe lc_net lc_hb lc_cluman lc_md lc_lvm lustre_start lnet
+
+SUBDIRS = systemd
-sbin_SCRIPTS = lustre_rmmod
+sbin_SCRIPTS = lustre_rmmod
ko2iblnd-probe
if RHEL
initdir = $(sysconfdir)/init.d
if RHEL
initdir = $(sysconfdir)/init.d
-init_SCRIPTS = lnet
+init_SCRIPTS =
+
+if !HAVE_SYSTEMD
+init_SCRIPTS += lnet
+endif
+
if SERVER
init_SCRIPTS += lustre
if SERVER
init_SCRIPTS += lustre
+if GSS_KEYRING
+init_SCRIPTS += lsvcgss
+endif
endif
endif
endif
endif
@@
-60,6
+66,11
@@
bin_SCRIPTS += lustre_req_history
hadir = $(sysconfdir)/ha.d/resource.d
ha_SCRIPTS = Lustre.ha_v2
hadir = $(sysconfdir)/ha.d/resource.d
ha_SCRIPTS = Lustre.ha_v2
+if ZFS_ENABLED
+zedletdir = $(sysconfdir)/zfs/zed.d/
+zedlet_SCRIPTS = statechange-lustre.sh
+endif
+
scriptlibdir = @libexecdir@/@PACKAGE@
scriptlib_SCRIPTS = haconfig
scriptlib_DATA = lc_common
scriptlibdir = @libexecdir@/@PACKAGE@
scriptlib_SCRIPTS = haconfig
scriptlib_DATA = lc_common
@@
-71,14
+82,15
@@
endif
endif # UTILS
endif # UTILS
-EXTRA_DIST = license-status version_tag.pl version_tag-git.pl \
- version_tag-none.pl lustre_rmmod ldev lc_mon lhbadm \
+EXTRA_DIST = license-status lustre_rmmod ldev lc_mon lhbadm \
lc_servip lustre_routes_config lustre_routes_conversion \
$(addsuffix .in,$(genscripts)) lfs_migrate lustre_req_history \
lc_servip lustre_routes_config lustre_routes_conversion \
$(addsuffix .in,$(genscripts)) lfs_migrate lustre_req_history \
- lustre lnet lc_common haconfig Lustre.ha_v2 dkms.mkconf zfsobj2fid
+ lustre lsvcgss lc_common haconfig Lustre.ha_v2 dkms.mkconf \
+ zfsobj2fid ko2iblnd-probe statechange-lustre.sh
CLEANFILES = $(genscripts)
$(genscripts): %: %.in
CLEANFILES = $(genscripts)
$(genscripts): %: %.in
- sed -e 's#@scriptlibdir@#$(scriptlibdir)#' < $< > $@
+ sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
+ -e 's,@scriptlibdir\@,$(scriptlibdir),g' $< > $@
chmod +x $@
chmod +x $@