Branch b_head_libcfs

b=16445

Cleanup type definitions.

Remove lustre_types.h, lustre/types.h, and libcfs/types.h. The linux types (__u8 etc)
are now defined by arch specific includes in libcfs.

diff --git a/lustre.spec.in b/lustre.spec.in
index d21303c..fda6602 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -162,12 +162,15 @@ fi
 
 # Have universal lustre headers 
 if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
-  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
 
+if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/linux/lustre_types.h ] ; then
+  echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files
+fi
+
 echo '%attr(-, root, root) %{_libdir}/lustre/tests/*' >lustre-tests.files
 echo '%attr(-, root, root) /lib/modules/%{kversion}/kernel/fs/lustre/llog_test.*' >>lustre-tests.files
 modules_excludes="llog_test"