- build ldlm and ptlrpc 'cause obdecho wants them

- don't mess about with 2.5's host app shared library mechanisms, just link
  ptlctl in explicitly
- add a 2.5 ext3 san patch for ext3_get_block_handle and journal_handle_stop
- at least pretend to track the patches in series/jdike-2.5
- 'int flags', doh.

diff --git a/lnet/Kernelenv.in b/lnet/Kernelenv.in
index 0be4a5b..2e883c5 100644 (file)
--- a/lnet/Kernelenv.in
+++ b/lnet/Kernelenv.in
@@ -1,3 +1,5 @@
 EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/portals/include
 HOSTCFLAGS := $(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
index c47702f..7c66dfa 100644 (file)
--- a/lnet/Kernelenv.mk
+++ b/lnet/Kernelenv.mk
@@ -1,2 +1,4 @@
 EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/portals/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/lustre/Makefile.mk b/lustre/Makefile.mk
index 502c5ec..b341167 100644 (file)
--- a/lustre/Makefile.mk
+++ b/lustre/Makefile.mk
@@ -5,9 +5,11 @@ LINUX = @LINUX@
 
 obj-y += portals/
 obj-y += obdclass/
+obj-y += ldlm/
+#obj-y += lib/
+#obj-y += mds/
 obj-y += obdecho/
-obj-y += mds/
-obj-y += lib/
+obj-y += ptlrpc/
 
-# portals needs to be before utils/, which links against -lptlctl
+# portals needs to be before utils/, which pulls in ptlctl objects
 obj-m += utils/

diff --git a/lustre/portals/Kernelenv.in b/lustre/portals/Kernelenv.in
index 0be4a5b..2e883c5 100644 (file)
--- a/lustre/portals/Kernelenv.in
+++ b/lustre/portals/Kernelenv.in
@@ -1,3 +1,5 @@
 EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/portals/include
 HOSTCFLAGS := $(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/lustre/portals/Kernelenv.mk b/lustre/portals/Kernelenv.mk
index c47702f..7c66dfa 100644 (file)
--- a/lustre/portals/Kernelenv.mk
+++ b/lustre/portals/Kernelenv.mk
@@ -1,2 +1,4 @@
 EXTRA_CFLAGS := -Ifs/lustre/include -Ifs/lustre/portals/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