LU-11455 build: Remove conflicting lustre and Lustre

Some systems (Mac) are still case insensivite under some conditions,
so having lustre and Lustre in the same directory causes problems.
Seperate all the resource agents into their own directory.

Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: I6df370744ffecec9b9e52ffa9f131f02f351f6c5
Reviewed-on: https://review.whamcloud.com/33265
Tested-by: Jenkins
Reviewed-by: James Simmons <uja.ornl@yahoo.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index cb27144..2abe8cd 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -3465,6 +3465,7 @@ lustre/Makefile
 lustre/autoMakefile
 lustre/autoconf/Makefile
 lustre/conf/Makefile
+lustre/conf/resource/Makefile
 lustre/contrib/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile

diff --git a/lustre/conf/.gitignore b/lustre/conf/.gitignore
index 10a7e8d..70845e0 100644 (file)
--- a/lustre/conf/.gitignore
+++ b/lustre/conf/.gitignore
@@ -1 +1 @@
-/Makefile.in
+Makefile.in

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 8f1927c..634b344 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -32,9 +32,11 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
+SUBDIRS = resource
+DIST_SUBDIRS = resource
+
 EXTRA_DIST = lustre.dtd lustre2ldif.xsl top.ldif \
              99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \
-            Lustre healthLNET healthLUSTRE \
              lnet_routes.conf lnet.conf lgssc.conf
 
 sysconf_DATA = lnet.conf
@@ -48,8 +50,6 @@ udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
 if SERVER
-pacemakerdir = $(prefix)/lib/ocf/resource.d/lustre
-pacemaker_DATA = healthLNET healthLUSTRE Lustre
 if ZFS_ENABLED
 sysconf_DATA += ldev.conf
 endif

diff --git a/lustre/conf/Lustre b/lustre/conf/resource/Lustre
similarity index 100%
rename from lustre/conf/Lustre
rename to lustre/conf/resource/Lustre

diff --git a/lustre/conf/resource/Makefile.am b/lustre/conf/resource/Makefile.am
new file mode 100644 (file)
index 0000000..9893881
--- /dev/null
+++ b/lustre/conf/resource/Makefile.am
@@ -0,0 +1,37 @@
+#
+# GPL HEADER START
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 only,
+# as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License version 2 for more details (a copy is included
+# in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU General Public License
+# version 2 along with this program; If not, see
+# http://www.gnu.org/licenses/gpl-2.0.html
+#
+# GPL HEADER END
+#
+
+#
+# Copyright (c) 2018 Whamcloud
+#
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+# Lustre is a trademark of Sun Microsystems, Inc.
+#
+
+EXTRA_DIST = Lustre healthLNET healthLUSTRE
+
+if SERVER
+pacemakerdir = $(prefix)/lib/ocf/resource.d/lustre
+pacemaker_DATA = healthLNET healthLUSTRE Lustre
+endif

diff --git a/lustre/conf/healthLNET b/lustre/conf/resource/healthLNET
similarity index 100%
rename from lustre/conf/healthLNET
rename to lustre/conf/resource/healthLNET

diff --git a/lustre/conf/healthLUSTRE b/lustre/conf/resource/healthLUSTRE
similarity index 100%
rename from lustre/conf/healthLUSTRE
rename to lustre/conf/resource/healthLUSTRE