patch: arla 0.5 on Linux/glibc2

Brad Keryan keryan at andrew.cmu.edu
Fri May 1 05:35:33 CEST 1998


Here's a minor patch to get arla 0.5 to build on Linux/glibc (RedHat 5.0,
x86).  It also changes the linking of libroken from -lroken to
.../libroken.a because otherwise gcc finds the libroken.a from kth krb4
and uses that; is there a better way to make it link against the right
library? 

I still haven't gotten the kernel part working with Linux 2.0.33/x86 and
have not had the time to take a closer look.

Also, what does everybody think of the idea of an ftp-type interface to
arla? I think it would be useful to extend the "arlad -t" interface to
allow "put" and "get" commands and other niceties. Would it be better to
make this a separate program from arlad, with a per-user cache? Also, does
any of arlad need root privileges for anything other than directory
permissions on /usr/arla/*? 

	Brad

--- cut here ---
diff -urN ../arla-0.5-clean/appl/Makefile.in arla-0.5/appl/Makefile.in
--- ../arla-0.5-clean/appl/Makefile.in	Wed Apr 15 17:48:24 1998
+++ arla-0.5/appl/Makefile.in	Thu Apr 30 23:17:33 1998
@@ -49,7 +49,7 @@
 		  @LIB_readline@ \
 		  $(RXKAD_LIBS) \
 		  $(KAFS_LIBS) \
-		  -L../lib/roken -lroken @LIBS@
+		  ../lib/roken/libroken.a @LIBS@
 LIBDEPENDS	= ../rxdef/librxdefclient.a ../rx/librx.a ../lwp/liblwp.a \
 		  ../util/libutil.a ../lib/sl/libsl.a ../lib/roken/libroken.a \
 		  ../lib/ko/libko.a
diff -urN ../arla-0.5-clean/xfs/include/xfs_message.h arla-0.5/xfs/include/xfs_message.h
--- ../arla-0.5-clean/xfs/include/xfs_message.h	Wed Apr 15 17:49:18 1998
+++ arla-0.5/xfs/include/xfs_message.h	Thu Apr 30 23:17:33 1998
@@ -41,8 +41,10 @@
 #ifndef _xmsg_h
 #define _xmsg_h
 
+#if !(defined(linux) && defined(HAVE_GLIBC) && defined(__KERNEL__))
 #include <sys/types.h>
 #include <sys/param.h>
+#endif
 
 #include <xfs_attr.h>
 
diff -urN ../arla-0.5-clean/xfs/linux/xfs_fs.h arla-0.5/xfs/linux/xfs_fs.h
--- ../arla-0.5-clean/xfs/linux/xfs_fs.h	Wed Apr 15 17:49:20 1998
+++ arla-0.5/xfs/linux/xfs_fs.h	Thu Apr 30 23:17:33 1998
@@ -4,7 +4,9 @@
 #include <xfs_common.h>
 #include <xfs_node.h>
 #include <namei.h>
+#if !(defined(linux) && defined(HAVE_GLIBC) && defined(__KERNEL__))
 #include <sys/types.h>
+#endif
 
 /*
  * Filesystem struct.
diff -urN ../arla-0.5-clean/xfs/linux/xfs_locl.h arla-0.5/xfs/linux/xfs_locl.h
--- ../arla-0.5-clean/xfs/linux/xfs_locl.h	Wed Apr 15 17:49:21 1998
+++ arla-0.5/xfs/linux/xfs_locl.h	Thu Apr 30 23:18:54 1998
@@ -51,10 +51,6 @@
 #include <linux/string.h>
 #include <linux/locks.h>
 #include <linux/module.h>
-#include "xfs_message.h"
-#include "xfs_fs.h"
-#include "xfs_node.h"
-#include "xdeb.h"
 
 extern inline int signal_pending(struct task_struct *p)
 {
@@ -80,3 +76,12 @@
 #define MAXPATHLEN PATH_MAX
 
 #endif
+
+/* We must include these files after the kernel types are correctly defined
+ because they use some of those types */
+
+#include "xfs_message.h"
+#include "xfs_fs.h"
+#include "xfs_node.h"
+#include "xdeb.h"
+






More information about the Arla-drinkers mailing list