LU-2675 build: remove obsolete Kernelenv files

Remove the obsolete Kernelenv.{in,mk} files from libcfs/ and lnet/.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I778b00c3c4b315d9811f594d2b99457a83b696c7
Reviewed-on: http://review.whamcloud.com/13196
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/libcfs/.gitignore b/libcfs/.gitignore
index 57ee492..ac46dc9 100644 (file)
--- a/libcfs/.gitignore
+++ b/libcfs/.gitignore
@@ -1,3 +1,2 @@
-/Kernelenv
 /aclocal.m4
 /autom4te.cache

diff --git a/libcfs/Kernelenv.in b/libcfs/Kernelenv.in
deleted file mode 100644 (file)
index 59eda30..0000000
--- a/libcfs/Kernelenv.in
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/lnet/include
-# lnet/utils/debug.c wants <linux/version.h> from userspace.  sigh.
-HOSTCFLAGS := -I@LINUX@/include $(EXTRA_CFLAGS)
-LIBREADLINE := @LIBREADLINE@
-# 2.5's makefiles aren't nice to cross dir libraries in host programs
-PTLCTLOBJS := debug.o l_ioctl.o parser.o portals.o

diff --git a/libcfs/Kernelenv.mk b/libcfs/Kernelenv.mk
deleted file mode 100644 (file)
index d973e5d..0000000
--- a/libcfs/Kernelenv.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/lnet/include
-HOSTCFLAGS := $(EXTRA_CFLAGS)
-# the kernel doesn't want us to build archives for host binaries :/
-PTLCTLOBJS := debug.o l_ioctl.o parser.o portals.o

diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4
index 1053e91..24cc7f1 100644 (file)
--- a/libcfs/autoconf/lustre-libcfs.m4
+++ b/libcfs/autoconf/lustre-libcfs.m4
@@ -437,7 +437,6 @@ AM_CONDITIONAL(NEED_PCLMULQDQ_CRC32C, [test "x$enable_crc32c_crypto" = xyes])
 #
 AC_DEFUN([LIBCFS_CONFIG_FILES], [
 AC_CONFIG_FILES([
-libcfs/Kernelenv
 libcfs/Makefile
 libcfs/autoMakefile
 libcfs/autoconf/Makefile

diff --git a/lnet/.gitignore b/lnet/.gitignore
index 57ee492..ac46dc9 100644 (file)
--- a/lnet/.gitignore
+++ b/lnet/.gitignore
@@ -1,3 +1,2 @@
-/Kernelenv
 /aclocal.m4
 /autom4te.cache

diff --git a/lnet/Kernelenv.in b/lnet/Kernelenv.in
deleted file mode 100644 (file)
index 59eda30..0000000
--- a/lnet/Kernelenv.in
+++ /dev/null
@@ -1,6 +0,0 @@
-EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/lnet/include
-# lnet/utils/debug.c wants <linux/version.h> from userspace.  sigh.
-HOSTCFLAGS := -I@LINUX@/include $(EXTRA_CFLAGS)
-LIBREADLINE := @LIBREADLINE@
-# 2.5's makefiles aren't nice to cross dir libraries in host programs
-PTLCTLOBJS := debug.o l_ioctl.o parser.o portals.o

diff --git a/lnet/Kernelenv.mk b/lnet/Kernelenv.mk
deleted file mode 100644 (file)
index d973e5d..0000000
--- a/lnet/Kernelenv.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/lnet/include
-HOSTCFLAGS := $(EXTRA_CFLAGS)
-# the kernel doesn't want us to build archives for host binaries :/
-PTLCTLOBJS := debug.o l_ioctl.o parser.o portals.o

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index ad390bf..2236120 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -698,7 +698,6 @@ AM_CONDITIONAL(BUILD_DLC,        test x$USE_DLC = "xyes")
 #
 AC_DEFUN([LN_CONFIG_FILES], [
 AC_CONFIG_FILES([
-lnet/Kernelenv
 lnet/Makefile
 lnet/autoMakefile
 lnet/autoconf/Makefile

diff --git a/lustre-iokit/.gitignore b/lustre-iokit/.gitignore
index f133c40..1869448 100644 (file)
--- a/lustre-iokit/.gitignore
+++ b/lustre-iokit/.gitignore
@@ -1,4 +1,3 @@
-/Kernelenv
 /Makefile.in
 /aclocal.m4
 /autom4te.cache