. Small change to lustre.spec.in to resolve problem in rpm building,

   it's tested in b1_4 and b1_5.
. Fix rpm building problem in b1_5
. Rename $(platform)/types.h to $(platform)/lustre_types.h to avoid
  confusing while compile.
. portability fix for lov_obd.c

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 3d81a29..0101a7e 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -117,7 +117,6 @@ cat >lustre.files <<EOF
 %attr(-, root, root) %{_libdir}/libptlctl.a
 %attr(-, root, root) %{_libdir}/liblustreapi.a
 %attr(-, root, root) /usr/include/lustre
 %attr(-, root, root) %{_libdir}/libptlctl.a
 %attr(-, root, root) %{_libdir}/liblustreapi.a
 %attr(-, root, root) /usr/include/lustre

-%attr(-, root, root) /usr/include/linux/lustre_idl.h

 
 %attr(-, root, root) %{_mandir}/man?/*
 
 
 %attr(-, root, root) %{_mandir}/man?/*
 


@@ -134,6 +133,16 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
   echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>lustre.files
 fi
 
   echo '%attr(-, root, root) %{_datadir}/lustre/snmp/mibs' >>lustre.files
 fi
 

+# Have universal lustre headers 
+if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre_idl.h ] ; then
+  echo '%attr(-, root, root) /usr/include/lustre_idl.h' >>lustre.files
+  echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files
+  echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files
+  echo '%attr(-, root, root) /usr/include/linux/lustre_user.h' >>lustre.files
+else
+  echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files
+fi
+

 %files -f lustre.files
 
 %files modules
 %files -f lustre.files
 
 %files modules