i386-apple-darwin8.*)
AFS_SYSNAME="x86_darwin_80"
;;
+ powerpc-apple-darwin9.*)
+ AFS_SYSNAME="ppc_darwin_90"
+ ;;
+ i386-apple-darwin9.*)
+ AFS_SYSNAME="x86_darwin_90"
+ ;;
sparc-sun-solaris2.5*)
AFS_SYSNAME="sun4x_55"
enable_login="yes"
register int i;
afs_warn("Looking for locked data structures.\n");
- afs_warn("conn %x, volume %x, user %x, cell %x, server %x\n", afs_xconn,
- afs_xvolume, afs_xuser, afs_xcell, afs_xserver);
+ afs_warn("conn %lx, volume %lx, user %lx, cell %lx, server %lx\n", &afs_xconn,
+ &afs_xvolume, &afs_xuser, &afs_xcell, &afs_xserver);
{
register struct vcache *tvc;
AFS_STATCNT(afs_CheckLocks);
#define AFS_SC_DARWIN_14 3
#define AFS_SC_DARWIN_60 4
#define AFS_SC_DARWIN_70 5
+#define AFS_SC_DARWIN_80 6
+#define AFS_SC_DARWIN_90 7
/* AFS_SC_DARWIN_ALL: darwin version-independent sysctls */
#define AFS_SC_DARWIN_ALL_REALMODES 1
/* AFS_SC_DARWIN_70: darwin 7.x sysctls */
/* nothing defined */
+/* AFS_SC_DARWIN_80: darwin 8.x sysctls */
+ /* nothing defined */
+
+/* AFS_SC_DARWIN_90: darwin 9.x sysctls */
+ /* nothing defined */
+
#endif /* AFS_SYSCTL_H */
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-LDFLAGS = ${XLDFLAGS}
+LDFLAGS = ${XLDFLAGS} ${ARCHFLAGS}
#
# What to make
}
strncpy(curr_FS->hostName, he->h_name, HOST_NAME_LEN); /* complete name */
memcpy(&(curr_skt->sin_addr.s_addr), he->h_addr, 4);
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ curr_skt->sin_family = AF_INET; /*Internet family */
+#else
curr_skt->sin_family = htons(AF_INET); /*Internet family */
+#endif
curr_skt->sin_port = htons(7000); /*FileServer port */
#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
curr_skt->sin_len = sizeof(struct sockaddr_in);
}
strncpy(curr_CM->hostName, he->h_name, HOST_NAME_LEN); /* complete name */
memcpy(&(curr_skt->sin_addr.s_addr), he->h_addr, 4);
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ curr_skt->sin_family = AF_INET; /*Internet family */
+#else
curr_skt->sin_family = htons(AF_INET); /*Internet family */
+#endif
curr_skt->sin_port = htons(7001); /*Cache Manager port */
#ifdef STRUCT_SOCKADDR_HAS_SA_LEN
curr_skt->sin_len = sizeof(struct sockaddr_in);
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
all: ${TOP_LIBDIR}/libaudit.a ${TOP_INCDIR}/afs/audit.h
LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L${DESTDIR}/lib/rx
LIBS= -lauth -lsys -lrx -llwp -lafsutil ${XLIBS}
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS} ${ARCHFLAGS}
tests all: testcellconf ktctest
INCDIRS=-I${TOP_INCDIR} -I..
LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L..
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS}
all: testproc smail-notifier
REGEX_OBJ="regex.o"
XCFLAGS="-traditional-cpp"
SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
;;
ppc_darwin_13)
REGEX_OBJ="regex.o"
XCFLAGS="-no-cpp-precomp"
SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
;;
ppc_darwin_14)
REGEX_OBJ="regex.o"
XCFLAGS="-no-cpp-precomp"
SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
;;
ppc_darwin_60)
XCFLAGS="-no-cpp-precomp"
TXLIBS="-lncurses"
SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
;;
ppc_darwin_70)
TXLIBS="-lncurses"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
;;
*_darwin_80)
AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
LEX="lex -l"
- MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS}'
+ MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
KROOT=
KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
- LWP_OPTMZ="-O2"
+ KERN_OPTMZ="-Os"
+ LWP_OPTMZ="-Os"
+ OPTMZ="-Os"
+ REGEX_OBJ="regex.o"
+ TXLIBS="-lncurses"
+ EXTRA_VLIBOBJS="fstab.o"
+ SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
+ ;;
+
+ *_darwin_90)
+ AFSD_LDFLAGS="-F/System/Library/PrivateFrameworks -framework DiskArbitration"
+ LEX="lex -l"
+ MT_CFLAGS='-DAFS_PTHREAD_ENV -D_REENTRANT ${XCFLAGS} ${ARCHFLAGS}'
+ KROOT=
+ KINCLUDES='-I$(KROOT)/System/Library/Frameworks/Kernel.framework/Headers'
+ LD="cc"
+ KERN_OPTMZ="-Os"
+ LWP_OPTMZ="-Os"
+ OPTMZ="-Os"
REGEX_OBJ="regex.o"
- XCFLAGS="-no-cpp-precomp"
TXLIBS="-lncurses"
EXTRA_VLIBOBJS="fstab.o"
SHLIB_LINKER="${MT_CC} -dynamiclib"
+ SHLIB_SUFFIX="dylib"
;;
ppc_linux*)
INCDIRS= -I${SRCDIR}/include -I${SRCDIR}/include/afs -I..
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS}
all: test
test tests: ctest dtest itest
INCDIRS=-I${TOP_INCDIR} -I..
LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L..
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} -lcom_err ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} -lcom_err ${XCFLAGS} ${ARCHFLAGS}
all: test
COMMON_INCL=-I${TOP_OBJDIR}/src/config -I. -I${srcdir} -I${TOP_INCDIR} -I${TOP_INCDIR}/afs -I${TOP_INCDIR}/rx -I${TOP_OBJDIR} -I${TOP_SRCDIR} -I${TOP_OBJDIR}/src
COMMON_CFLAGS=${DBG} ${OPTMZ} ${COMMON_INCL}
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS}
-LDFLAGS=${XLDFLAGS}
+CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS}
+LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
.c.o:
$(CCOBJ) $(CFLAGS) -c $<
#PAM_CFLAGS = -O2 -Dlinux -DLINUX_PAM -fPIC
# Put -O2 here to _ensure_ all Makefiles pick it up.
XCFLAGS= ${DBG} -Dfds_bits=fd_bits -DAFS_AFSDB_ENV -DAFS_FREELANCE_CLIENT
-MT_CFLAGS=${XCFLAGS}
+MT_CFLAGS=${XCFLAGS} ${ARCHFLAGS}
XLDFLAGS=
SHLIB_LDFLAGS = -shared -Xlinker -x
SHLIB_SUFFIX=so
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} -I. ${XCFLAGS}
+CFLAGS=${DBG} ${OPTMZ} -I${TOP_INCDIR} -I. ${XCFLAGS} ${ARCHFLAGS}
INST=$(RM) -f $@; $(CP) $? $@
#define SYS_NAME_ID_ppc_darwin_70 507
#define SYS_NAME_ID_ppc_darwin_80 508
#define SYS_NAME_ID_x86_darwin_80 509
+#define SYS_NAME_ID_ppc_darwin_90 510
+#define SYS_NAME_ID_x86_darwin_90 511
#define SYS_NAME_ID_next_mach20 601
#define SYS_NAME_ID_next_mach30 602
#define AFS_ENV 1
#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
#define AFS_64BIT_CLIENT 1
-#define AFS_64BIT_IOPS_ENV 1
-#define AFS_PPC_ENV 1
-#define AFS_VFSINCL_ENV 1
+#define AFS_64BIT_IOPS_ENV 1
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_VFSINCL_ENV 1
#include <afs/afs_sysnames.h>
#define AFS_MOUNT_AFS "afs"
/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define sys_ppc_darwin_14 1
-#define sys_ppc_darwin_60 1
-#define sys_ppc_darwin_70 1
-#define sys_ppc_darwin_80 1
-#define SYS_NAME "ppc_darwin_80"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_80
-#define AFSBIG_ENDIAN 1
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define SYS_NAME "ppc_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_80
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define SYS_NAME "x86_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_80
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
#define AFS_HAVE_FFS 1 /* Use system's ffs. */
#define AFS_GCPAGS 0
#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
#define AFS_ENV 1
#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_PPC_ENV 1
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_MOUNT_AFS "afs"
/* Machine / Operating system information */
-#define sys_ppc_darwin_12 1
-#define sys_ppc_darwin_13 1
-#define sys_ppc_darwin_14 1
-#define sys_ppc_darwin_60 1
-#define sys_ppc_darwin_70 1
-#define sys_ppc_darwin_80 1
-#define SYS_NAME "ppc_darwin_80"
-#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_80
-#define AFSBIG_ENDIAN 1
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define SYS_NAME "ppc_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_80
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define SYS_NAME "x86_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_80
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
#define AFS_HAVE_FFS 1 /* Use system's ffs. */
#define AFS_UIOSYS UIO_SYSSPACE
--- /dev/null
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_ENV 1
+#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
+#define AFS_64BIT_CLIENT 1
+#define AFS_64BIT_IOPS_ENV 1
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_VFSINCL_ENV 1
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_DARWIN_ENV
+#define AFS_DARWIN13_ENV
+#define AFS_DARWIN14_ENV
+#define AFS_DARWIN60_ENV
+#define AFS_DARWIN70_ENV
+#define AFS_DARWIN80_ENV
+#define AFS_DARWIN90_ENV
+#define AFS_NONFSTRANS
+#define AFS_SYSCALL 230
+#define AFS_NAMEI_ENV 1
+#define DARWIN_REFBASE 3
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS "afs"
+
+/* Machine / Operating system information */
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define sys_ppc_darwin_90 1
+#define SYS_NAME "ppc_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_90
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define sys_x86_darwin_90 1
+#define SYS_NAME "x86_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_90
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+
+#define AFS_GCPAGS 0
+#define RXK_LISTENER_ENV 1
+
+#ifdef KERNEL
+#undef MACRO_BEGIN
+#undef MACRO_END
+#include <kern/macro_help.h>
+#define AFS_GLOBAL_SUNLOCK 1
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES CLBYTES
+#define osi_GetTime(x) microtime(x)
+#define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK)
+#define AFS_KFREE(x,y) _FREE(x,M_TEMP)
+#define v_count v_usecount
+#define v_vfsp v_mount
+#define vfs_bsize mnt_stat.f_bsize
+#define vfs_fsid mnt_stat.f_fsid
+#define va_nodeid va_fileid
+#define vfs_vnodecovered mnt_vnodecovered
+#define direct dirent
+
+#define BIND_8_COMPAT
+
+#endif
+#endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
+#define AFS_ENV 1
+#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
+
+#include <afs/afs_sysnames.h>
+#define AFS_USERSPACE_ENV
+#define AFS_USR_DARWIN_ENV
+#define AFS_USR_DARWIN13_ENV
+#define AFS_USR_DARWIN14_ENV
+#define AFS_USR_DARWIN60_ENV
+#define AFS_USR_DARWIN70_ENV
+#define AFS_USR_DARWIN80_ENV
+#define AFS_USR_DARWIN90_ENV
+#define AFS_NONFSTRANS
+#define AFS_SYSCALL 230
+#define DARWIN_REFBASE 0
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS "afs"
+
+/* Machine / Operating system information */
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define sys_ppc_darwin_90 1
+#define SYS_NAME "ppc_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_90
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define sys_x86_darwin_90 1
+#define SYS_NAME "x86_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_90
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+#define RXK_LISTENER_ENV 1
+
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#define BIND_8_COMPAT
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */
#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
#define AFS_64BIT_CLIENT 1
#define AFS_64BIT_IOPS_ENV 1
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
#define AFS_VFSINCL_ENV 1
#include <afs/afs_sysnames.h>
#define AFS_MOUNT_AFS "afs"
/* Machine / Operating system information */
-#define sys_x86_darwin_12 1
-#define sys_x86_darwin_13 1
-#define sys_x86_darwin_14 1
-#define sys_x86_darwin_60 1
-#define sys_x86_darwin_70 1
-#define sys_x86_darwin_80 1
-#define SYS_NAME "x86_darwin_80"
-#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_80
-#define AFSLITTLE_ENDIAN 1
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define SYS_NAME "ppc_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_80
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define SYS_NAME "x86_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_80
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
#define AFS_HAVE_FFS 1 /* Use system's ffs. */
#define AFS_GCPAGS 0
#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
#define AFS_ENV 1
#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
-#define AFS_X86_ENV 1
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
#include <afs/afs_sysnames.h>
#define AFS_USERSPACE_ENV
#define AFS_MOUNT_AFS "afs"
/* Machine / Operating system information */
-#define sys_x86_darwin_12 1
-#define sys_x86_darwin_13 1
-#define sys_x86_darwin_14 1
-#define sys_x86_darwin_60 1
-#define sys_x86_darwin_70 1
-#define sys_x86_darwin_80 1
-#define SYS_NAME "x86_darwin_80"
-#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_80
-#define AFSLITTLE_ENDIAN 1
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define SYS_NAME "ppc_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_80
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define SYS_NAME "x86_darwin_80"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_80
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
#define AFS_HAVE_FFS 1 /* Use system's ffs. */
#define AFS_UIOSYS UIO_SYSSPACE
--- /dev/null
+#ifndef UKERNEL
+/* This section for kernel libafs compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_ENV 1
+#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
+#define AFS_64BIT_CLIENT 1
+#define AFS_64BIT_IOPS_ENV 1
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_VFSINCL_ENV 1
+
+#include <afs/afs_sysnames.h>
+
+#define AFS_DARWIN_ENV
+#define AFS_DARWIN13_ENV
+#define AFS_DARWIN14_ENV
+#define AFS_DARWIN60_ENV
+#define AFS_DARWIN70_ENV
+#define AFS_DARWIN80_ENV
+#define AFS_DARWIN90_ENV
+#define AFS_NONFSTRANS
+#define AFS_SYSCALL 230
+#define AFS_NAMEI_ENV 1
+#define DARWIN_REFBASE 3
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS "afs"
+
+/* Machine / Operating system information */
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define sys_ppc_darwin_90 1
+#define SYS_NAME "ppc_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_90
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define sys_x86_darwin_90 1
+#define SYS_NAME "x86_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_90
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+
+#define AFS_GCPAGS 0
+#define RXK_LISTENER_ENV 1
+
+#ifdef KERNEL
+#undef MACRO_BEGIN
+#undef MACRO_END
+#include <kern/macro_help.h>
+#define AFS_GLOBAL_SUNLOCK 1
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define AFS_CLBYTES CLBYTES
+#define osi_GetTime(x) microtime(x)
+#define AFS_KALLOC(x) _MALLOC(x, M_TEMP, M_WAITOK)
+#define AFS_KFREE(x,y) _FREE(x,M_TEMP)
+#define v_count v_usecount
+#define v_vfsp v_mount
+#define vfs_bsize mnt_stat.f_bsize
+#define vfs_fsid mnt_stat.f_fsid
+#define va_nodeid va_fileid
+#define vfs_vnodecovered mnt_vnodecovered
+#define direct dirent
+
+#define BIND_8_COMPAT
+
+#endif
+#endif /* AFS_PARAM_H */
+
+#else /* !defined(UKERNEL) */
+
+/* This section for user space compiles only */
+
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+#define AFS_VFSINCL_ENV 1 /* NOBODY uses this.... */
+#define AFS_ENV 1
+#define AFS_64BIT_ENV 1 /* Defines afs_int32 as int, not long. */
+#if defined(__ppc__)
+#define AFS_PPC_ENV 1
+#elif defined(__i386__)
+#define AFS_X86_ENV 1
+#else
+#error Unsupported architecture
+#endif
+
+#include <afs/afs_sysnames.h>
+#define AFS_USERSPACE_ENV
+#define AFS_USR_DARWIN_ENV
+#define AFS_USR_DARWIN13_ENV
+#define AFS_USR_DARWIN14_ENV
+#define AFS_USR_DARWIN60_ENV
+#define AFS_USR_DARWIN70_ENV
+#define AFS_USR_DARWIN80_ENV
+#define AFS_USR_DARWIN90_ENV
+#define AFS_NONFSTRANS
+#define AFS_SYSCALL 230
+#define DARWIN_REFBASE 0
+
+/* File system entry (used if mount.h doesn't define MOUNT_AFS */
+#define AFS_MOUNT_AFS "afs"
+
+/* Machine / Operating system information */
+#if defined(__ppc__)
+#define sys_ppc_darwin_12 1
+#define sys_ppc_darwin_13 1
+#define sys_ppc_darwin_14 1
+#define sys_ppc_darwin_60 1
+#define sys_ppc_darwin_70 1
+#define sys_ppc_darwin_80 1
+#define sys_ppc_darwin_90 1
+#define SYS_NAME "ppc_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_ppc_darwin_90
+#define AFSBIG_ENDIAN 1
+#elif defined(__i386__)
+#define sys_x86_darwin_12 1
+#define sys_x86_darwin_13 1
+#define sys_x86_darwin_14 1
+#define sys_x86_darwin_60 1
+#define sys_x86_darwin_70 1
+#define sys_x86_darwin_80 1
+#define sys_x86_darwin_90 1
+#define SYS_NAME "x86_darwin_90"
+#define SYS_NAME_ID SYS_NAME_ID_x86_darwin_90
+#define AFSLITTLE_ENDIAN 1
+#else
+#error Unsupported architecture
+#endif
+#define AFS_HAVE_FFS 1 /* Use system's ffs. */
+
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+
+#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */
+#define RXK_LISTENER_ENV 1
+
+#define AFS_VFS34 1 /* What is VFS34??? */
+#define afsio_iov uio_iov
+#define afsio_iovcnt uio_iovcnt
+#define afsio_offset uio_offset
+#define afsio_seg uio_segflg
+#define afsio_resid uio_resid
+#define AFS_UIOSYS UIO_SYSSPACE
+#define AFS_UIOUSER UIO_USERSPACE
+#define VATTR_NULL usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#define BIND_8_COMPAT
+#endif /* AFS_PARAM_H */
+
+#endif /* !defined(UKERNEL) */
#error unknown osf
#endif
#else
-#if defined(AFS_X86_ENV)
+#if defined(AFS_X86_ENV) && !defined(AFS_DARWIN_ENV)
#include "conf-bsd-ncr.h"
#else
#ifdef AFS_NT40_ENV
#error "MSBFIRST or LSBFIRST undefined"
#endif
#define MUSTALIGN
+#if !defined(KERNEL) && defined(AFS_DARWIN80_ENV)
+extern int _darwin_swap_long_bytes_bit_number(afs_uint32 x);
+extern char *_darwin_whichstr[];
+extern int _darwin_which;
+#endif /* !KERNEL && AFS_DARWIN80_ENV */
gen(FILE * stream)
{
register int i;
+#ifdef AFS_DARWIN80_ENV
+ int j;
+
+#define swap_long_bytes_bit_number _darwin_swap_long_bytes_bit_number
+#endif /* AFS_DARWIN80_ENV */
/* clear the output */
fprintf(stream, " L2 = 0; R2 = 0;\n");
#define SWAP(i,j) \
swap_long_bytes_bit_number(swap_bit_pos_0_to_ansi((unsigned)i)-j)
+#ifdef AFS_DARWIN80_ENV
+ for(j = 0;; j++) {
+ fprintf(stream, _darwin_whichstr[j]);
+ if (j == 2)
+ break;
+#endif /* AFS_DARWIN80_ENV */
/* first setup FP */
fprintf(stream, "/* FP operations */\n/* first left to left */\n");
for (i = 32; i <= 63; i++)
if (FP[i] >= 32)
test_set(stream, "R1", FP[i] - 32, "R2", SWAP(i, 32));
+#ifdef AFS_DARWIN80_ENV
+ _darwin_which = !_darwin_which;
+ }
+#endif /* AFS_DARWIN80_ENV */
}
gen(FILE * stream)
{
register int i;
+#ifdef AFS_DARWIN80_ENV
+ int j;
+
+#define swap_long_bytes_bit_number _darwin_swap_long_bytes_bit_number
+#endif /* AFS_DARWIN80_ENV */
/* clear the output */
fprintf(stream, " L2 = 0; R2 = 0;\n");
+#ifdef AFS_DARWIN80_ENV
+ for(j = 0;; j++) {
+ fprintf(stream, _darwin_whichstr[j]);
+ if (j == 2)
+ break;
+#endif /* AFS_DARWIN80_ENV */
/* first setup IP */
fprintf(stream, "/* IP operations */\n/* first left to left */\n");
for (i = 32; i <= 63; i++)
if (IP[i] >= 32)
test_set(stream, "R1", SWAP(IP[i] - 32), "R2", i - 32);
+#ifdef AFS_DARWIN80_ENV
+ _darwin_which = !_darwin_which;
+ }
+#endif /* AFS_DARWIN80_ENV */
exit(0);
}
fprintf(stream, " P_temp = R1;\n");
fprintf(stream, " P_temp_p = (unsigned char *) &P_temp;\n");
+#ifdef AFS_DARWIN80_ENV
+ fprintf(stream, "#if defined(__i386__)\n");
+ fprintf(stream, " R2 = P_prime[0][*P_temp_p++];\n");
+ fprintf(stream, " R2 |= P_prime[1][*P_temp_p++];\n");
+ fprintf(stream, " R2 |= P_prime[2][*P_temp_p++];\n");
+ fprintf(stream, " R2 |= P_prime[3][*P_temp_p];\n");
+ fprintf(stream, "#elif defined(__ppc__)\n");
+ fprintf(stream, " R2 = P_prime[3][*P_temp_p++];\n");
+ fprintf(stream, " R2 |= P_prime[2][*P_temp_p++];\n");
+ fprintf(stream, " R2 |= P_prime[1][*P_temp_p++];\n");
+ fprintf(stream, " R2 |= P_prime[0][*P_temp_p];\n");
+ fprintf(stream, "#else\n#error Unsupported architecture\n#endif\n");
+#else /* !AFS_DARWIN80_ENV */
#ifdef LSBFIRST
fprintf(stream, " R2 = P_prime[0][*P_temp_p++];\n");
fprintf(stream, " R2 |= P_prime[1][*P_temp_p++];\n");
fprintf(stream, " R2 |= P_prime[1][*P_temp_p++];\n");
fprintf(stream, " R2 |= P_prime[0][*P_temp_p];\n");
#endif /* MSBFIRST */
+#endif /* !AFS_DARWIN80_ENV */
#endif /* BIG */
}
#endif /* MSBFIRST */
}
+#if !defined(KERNEL) && defined(AFS_DARWIN80_ENV)
+char *_darwin_whichstr[] = {
+ "#if defined(__ppc__)\n",
+ "#elif defined(__i386__)\n",
+ "#else\n#error architecture unsupported\n#endif\n"
+};
+int _darwin_which = 1;
+
+int
+_darwin_swap_long_bytes_bit_number(afs_uint32 x)
+{
+ /*
+ * given a bit number (0-31) from a vax, swap the byte part of the
+ * bit number to change the byte ordering to mSBFIRST type
+ */
+
+ afs_uint32 y, z;
+
+ if (!_darwin_which)
+ return x;
+
+ y = x / 8; /* initial byte component */
+ z = x % 8; /* bit within byte */
+
+ x = (3 - y) * 8 + z;
+ return x;
+}
+#endif /* !KERNEL && AFS_DARWIN80_ENV */
+
void
test_set(FILE * stream, const char *src, int testbit, const char *dest,
int setbit)
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
# Test programs
PROGS = \
testit \
verify
-LDFLAGS = ${XLDFLAGS}
+LDFLAGS = ${XLDFLAGS} ${ARCHFLAGS}
LIBS=\
${TOP_LIBDIR}/libdes.a \
include @TOP_OBJDIR@/src/config/Makefile.config
LIBS = ${srcdir}/lib/libdir.a ${srcdir}/lib/util.a ${srcdir}/lib/liblwp.a
-CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${srcdir} -I${TOP_OBJDIR}/src/config ${XCFLAGS}
+CFLAGS=${OPTMZ} -I${TOP_INCDIR} -I${srcdir} -I${TOP_OBJDIR}/src/config ${XCFLAGS} ${ARCHFLAGS}
OBJS=test-salvage.o physio.o dtest.o
/*
* Fill in the socket array for bigbird, vice1, and vice2.
*/
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ FSSktArray[0].sin_family = AF_INET; /*Internet family */
+#else
FSSktArray[0].sin_family = htons(AF_INET); /*Internet family */
+#endif
FSSktArray[0].sin_port = htons(7000); /*FileServer port */
he = hostutil_GetHostByName("servername1");
if (he == NULL) {
}
memcpy(&(FSSktArray[0].sin_addr.s_addr), he->h_addr, 4);
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ FSSktArray[1].sin_family = AF_INET; /*Internet address family */
+#else
FSSktArray[1].sin_family = htons(AF_INET); /*Internet address family */
+#endif
FSSktArray[1].sin_port = htons(7000); /*FileServer port */
he = hostutil_GetHostByName("servername2");
if (he == NULL) {
}
memcpy(&(FSSktArray[1].sin_addr.s_addr), he->h_addr, 4);
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ FSSktArray[2].sin_family = AF_INET; /*Internet address family */
+#else
FSSktArray[2].sin_family = htons(AF_INET); /*Internet address family */
+#endif
FSSktArray[2].sin_port = htons(7000); /*FileServer port */
he = hostutil_GetHostByName("servername3");
if (he == NULL) {
LDIRS= -L${DESTDIR}/lib -L${DESTDIR}/lib/afs -L..
LIBS= -llwp -ldes -lrxkad -lauth -lcmd -lubik -lprot -lsys -lrx -lcom_err -lkauth
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS}
# the only tests _known_ to work are multiklog and the tcl scripts.
LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L..
LIBS= -lacl -lprot -lubik -lrx -llwp -lauth -lrxkad -lsys ${XLIBS}
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS}
all: acltest
$(CC) $(COMMON_INCLUDE) $(CFLAGS) -P -c $<
.c.o:
- $(CC) $(COMMON_INCLUDE) $(CFLAGS) $(KERN_DBG) -c $<
-CRULE_NOOPT= $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS) -c $?
-CRULE_OPT= $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS) -c $?
+ $(CC) $(COMMON_INCLUDE) $(CFLAGS) $(CFLAGS-$@) $(KERN_DBG) -c $<
+CRULE_NOOPT= $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS) $(CFLAGS-$@) -o $@ -c $?
+CRULE_OPT= $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS) $(CFLAGS-$@) -o $@ -c $?
system: all
rx_rdwr.o: $(TOP_SRC_RX)/rx_rdwr.c
$(CRULE_OPT)
afs_uuid.o: $(TOP_SRCDIR)/util/uuid.c
- $(CRULE_OPT) -o afs_uuid.o
+ $(CRULE_OPT)
xdr_afsuuid.o: $(TOP_SRCDIR)/rx/xdr_afsuuid.c
$(CRULE_OPT)
afs_daemons.o: $(TOP_SRC_AFS)/afs_daemons.c
$(CRULE_NOOPT)
afs_dir.o: $(TOP_SRCDIR)/dir/dir.c
- $(CRULE_NOOPT) -o afs_dir.o
+ $(CRULE_NOOPT)
AFS_component_version_number.o: AFS_component_version_number.c
$(CRULE_NOOPT)
afs_lock.o: $(TOP_SRC_AFS)/afs_lock.c
$(CRULE_NOOPT)
Kvldbint.cs.o: ${TOP_OBJ_VLSERVER}/Kvldbint.cs.c
$(CRULE_NOOPT)
+CFLAGS-Kvldbint.xdr.o= -DAFS_UUID_XG
Kvldbint.xdr.o: ${TOP_OBJ_VLSERVER}/Kvldbint.xdr.c
- $(CRULE_NOOPT) -DAFS_UUID_XG
+ $(CRULE_NOOPT)
rx_kmutex.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_kmutex.c
$(CRULE_NOOPT)
rx_knet.o: $(TOP_SRC_RX)/${MKAFS_OSTYPE}/rx_knet.c
$(CRULE_NOOPT)
# Files which do not contain NFS translator code.
+CFLAGS-afs_call.o= -DAFS_NONFSTRANS
afs_call.o: $(TOP_SRC_AFS)/afs_call.c
- $(CRULE_NOOPT) -DAFS_NONFSTRANS
+ $(CRULE_NOOPT)
+CFLAGS-afs_pioctl.o= -DAFS_NONFSTRANS
afs_pioctl.o: $(TOP_SRC_AFS)/afs_pioctl.c
- $(CRULE_NOOPT) -DAFS_NONFSTRANS
+ $(CRULE_NOOPT)
# NFS Translator versions of the above code.
afs_call_nfs.o: $(TOP_SRC_AFS)/afs_call.c
- $(CRULE_NOOPT) -o afs_call_nfs.o
+ $(CRULE_NOOPT)
afs_pioctl_nfs.o: $(TOP_SRC_AFS)/afs_pioctl.c
- $(CRULE_NOOPT) -o afs_pioctl_nfs.o
+ $(CRULE_NOOPT)
# Files which are specific to particular architectures/targets
# but have common build rules. Place here instead of duplicating
$(CRULE_NOOPT)
osi_misc.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_misc.c
$(CRULE_NOOPT)
+CFLAGS-osi_vfsops_nfs.o= -DAFS_WRAPPER=${LIBAFS}_wrapper -DAFS_CONF_DATA=${LIBAFS}_conf_data
osi_vfsops_nfs.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vfsops.c
- $(CRULE_NOOPT) -o osi_vfsops_nfs.o \
- -DAFS_WRAPPER=${LIBAFS}_wrapper \
- -DAFS_CONF_DATA=${LIBAFS}_conf_data
+ $(CRULE_NOOPT)
+CFLAGS-osi_vfsops.o= -DAFS_NONFSTRANS -DAFS_WRAPPER=${LIBAFSNONFS}_wrapper -DAFS_CONF_DATA=${LIBAFSNONFS}_conf_data
osi_vfsops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vfsops.c
- $(CRULE_NOOPT) -DAFS_NONFSTRANS \
- -DAFS_WRAPPER=${LIBAFSNONFS}_wrapper \
- -DAFS_CONF_DATA=${LIBAFSNONFS}_conf_data
+ $(CRULE_NOOPT)
osi_vm.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vm.c
$(CRULE_NOOPT)
osi_vnodeops.o: $(TOP_SRCDIR)/afs/$(MKAFS_OSTYPE)/osi_vnodeops.c
KDEFS=
DBUG =
DEFINES= -D_KERNEL -DKERNEL -DKERNEL_PRIVATE -DDIAGNOSTIC -DUSE_SELECT -DMACH_USER_API -DMACH_KERNEL
-<x86_darwin_80>
-KOPTS=-static -g -nostdinc -nostdlib -no-cpp-precomp -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch i386 -Di386 -DI386 -D__I386__ -DPAGE_SIZE_FIXED -march=i686 -mpreferred-stack-boundary=2 -falign-functions=4
-MODLD=$(CC) $(KOPTS)
-<ppc_darwin_80>
-KOPTS=-static -g -nostdinc -nostdlib -no-cpp-precomp -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch ppc -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED -O2 -mcpu=750 -mmultiple -fschedule-insns
-MODLD=$(CC) $(KOPTS)
-<all -ppc_darwin_80 -x86_darwin_80>
+<ppc_darwin_80 x86_darwin_80 ppc_darwin_90 x86_darwin_90>
+KOPTS_ppc=-static -g -nostdinc -nostdlib -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch ppc -Dppc -DPPC -D__PPC__ -DPAGE_SIZE_FIXED -mcpu=750 -mmultiple -fschedule-insns
+KOPTS_x86=-static -g -nostdinc -nostdlib -fno-builtin -finline -fno-keep-inline-functions -msoft-float -mlong-branch -fsigned-bitfields -arch i386 -Di386 -DI386 -D__I386__ -DPAGE_SIZE_FIXED -march=i686 -mpreferred-stack-boundary=2 -falign-functions=4
+ARCH_ppc=$(shell echo "${ARCHFLAGS}" | grep -q -w ppc && echo yes)
+ARCH_x86=$(shell echo "${ARCHFLAGS}" | grep -q -w i386 && echo yes)
+ifeq ($(ARCH_ppc),yes)
+ifeq ($(ARCH_x86),yes)
+MODLD=$(CC) -static -g -nostdlib -arch ppc -arch i386
+CFLAGS_ppc=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_ppc)
+CFLAGS_x86=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS_x86)
+else
+MODLD=$(CC) -static -g -nostdlib -arch ppc
+KOPTS=$(KOPTS_ppc)
+CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS)
+endif
+else
+ifeq ($(ARCH_x86),yes)
+MODLD=$(CC) -static -g -nostdlib -arch i386
+KOPTS=$(KOPTS_x86)
+else
+_ARCH=$(shell arch)
+MODLD=$(CC) -static -g -nostdlib -arch $(_ARCH)
+KOPTS=$(KOPTS_$(shell echo $(_ARCH) | sed 's/i386/x86/'))
+endif
+CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS)
+endif
+<all -ppc_darwin_80 -x86_darwin_80 -ppc_darwin_90 -x86_darwin_90>
MODLD=$(LD)
+CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS)
<ppc_darwin_70>
KOPTS=-static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch
<ppc_darwin_60>
<ppc_darwin_14 ppc_darwin_13 ppc_darwin_12>
KOPTS=-no-precomp -static -fno-common -finline -fno-keep-inline-functions -force_cpusubtype_ALL -msoft-float -mlong-branch
<all>
-CFLAGS=${KINCLUDES} -I. -I.. -I${TOP_OBJDIR}/src/config $(DEFINES) $(KDEFS) $(KOPTS) ${DBUG} ${OPTMZ}
KINCLUDES=-I${KROOT}/System/Library/Frameworks/Kernel.framework/Headers
include Makefile.common
+<ppc_darwin_80 x86_darwin_80 ppc_darwin_90 x86_darwin_90>
+ifeq ($(ARCH_ppc),yes)
+ifeq ($(ARCH_x86),yes)
+# override suffix rule; unfortunately, this causes a warning message
+.c.o:
+ $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.ppc.o,$@) -c $<
+ $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.x86.o,$@) -c $<
+ lipo -create $(patsubst %.o,%.ppc.o,$@) $(patsubst %.o,%.x86.o,$@) -output $@
+CRULE_NOOPT= \
+ $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.ppc.o,$@) -c $? && \
+ $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.x86.o,$@) -c $? && \
+ lipo -create $(patsubst %.o,%.ppc.o,$@) $(patsubst %.o,%.x86.o,$@) -output $@
+CRULE_OPT= \
+ $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_ppc) $(CFLAGS-$@) -o $(patsubst %.o,%.ppc.o,$@) -c $? && \
+ $(CC) $(COMMON_INCLUDE) $(KERN_DBG) $(KERN_OPTMZ) $(CFLAGS_x86) $(CFLAGS-$@) -o $(patsubst %.o,%.x86.o,$@) -c $? && \
+ lipo -create $(patsubst %.o,%.ppc.o,$@) $(patsubst %.o,%.x86.o,$@) -output $@
+endif
+endif
+<all>
+
setup:
-mkdir $(KOBJ)
-$(RM) $(KOBJ)/Makefile $(KOBJ)/Makefile.common $(KOBJ)/config
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>afs</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.openafs.filesystems.afs</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>8.0</string>
+ <key>CFBundleName</key>
+ <string>afs</string>
+ <key>CFBundlePackageType</key>
+ <string>KEXT</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.4.0</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.4.0</string>
+ <key>OSBundleLibraries</key>
+ <dict>
+ <key>com.apple.kpi.bsd</key>
+ <string>8.0.0</string>
+ <key>com.apple.kpi.mach</key>
+ <string>8.0.0</string>
+ <key>com.apple.kpi.libkern</key>
+ <string>8.0</string>
+ </dict>
+</dict>
+</plist>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>afs</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.openafs.filesystems.afs</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>8.0</string>
+ <key>CFBundleName</key>
+ <string>afs</string>
+ <key>CFBundlePackageType</key>
+ <string>KEXT</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.3.82</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>1.3.82</string>
+ <key>OSBundleLibraries</key>
+ <dict>
+ <key>com.apple.kpi.bsd</key>
+ <string>8.0.0</string>
+ <key>com.apple.kpi.mach</key>
+ <string>8.0.0</string>
+ <key>com.apple.kpi.libkern</key>
+ <string>8.0</string>
+ </dict>
+</dict>
+</plist>
CC = cc
DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
KOPTS=
-CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS)
-OPTF=-O
+CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBG} $(XCFLAGS) $(ARCHFLAGS)
+OPTF=-Os
# WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
-TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV
-TEST_LDFLAGS=
+TEST_CFLAGS=-D_REENTRANT -DAFS_PTHREAD_ENV $(XCFLAGS) $(ARCHFLAGS)
+TEST_LDFLAGS=$(XLDFLAGS) $(ARCHFLAGS)
TEST_LIBS=
LIBUAFS = libuafs.a
LDIRS=-L${TOP_LIBDIR} -L${DESTDIR}/lib/afs -L..
LIBS= -lauth -lrxkad -ldes -lsys -lrx -llwp -lcmd -lafsutil ${XLIBS}
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${LIBS} ${XCFLAGS} ${ARCHFLAGS}
all: testlog gettoktest
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${XCFLAGS} ${COMMON_INCL}
+CFLAGS=${LWP_DBG} ${LWP_OPTMZ} ${XCFLAGS} ${ARCHFLAGS} ${COMMON_INCL}
LIBOBJS=lwp.o process.o lock.o iomgr.o timer.o fasttime.o preempt.o \
waitkey.o threadname.o AFS_component_version_number.o
# This is required so sgi_64+ does not try to build this file.
process.s:
- echo Nothing to be done for process.s
+ @echo Nothing to be done for process.s
# Making process.o for $(SYS_NAME)
process.o : process.s process.i386.s process.c
- @case "$(SYS_NAME)" in \
+ @set -x; case "$(SYS_NAME)" in \
pmax_he1) \
$(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} process.s;; \
sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5* ) \
sgi_5* ) \
$(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \
sgi_61 | sgi_62 | sgi_63 ) \
- $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \
+ $(CCOBJ) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} ${ARCHFLAGS} -I${TOP_INCDIR} -KPIC -G0 ${srcdir}/process.s;; \
s390_*) \
/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s390.s >process.ss; \
${AS} -ahlns process.ss -o process.o >process.lst; \
/lib/cpp -P -I${TOP_INCDIR} ${srcdir}/process.s390x.s >process.ss; \
${AS} -ahlns process.ss -o process.o >process.lst; \
$(RM) process.ss ;; \
- ppc_darwin* ) \
- $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c ${XCFLAGS} -I${TOP_INCDIR} ${srcdir}/process.s;; \
- x86_darwin*) \
- /usr/bin/cpp -P -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s process.ss; \
- ${AS} process.ss -o process.o; \
- $(RM) process.ss ;; \
+ *_darwin* ) \
+ ppc=`echo "${ARCHFLAGS}" | grep -q -w ppc && echo yes` ; \
+ i386=`echo "${ARCHFLAGS}" | grep -q -w i386 && echo yes` ; \
+ if [ -z "$${ppc}" -a -z "$${i386}" ] ; then \
+ if [ `arch` = ppc ] ; then \
+ ppc=yes ; \
+ else \
+ i386=yes ; \
+ fi ; \
+ fi ; \
+ if [ -n "$${ppc}" ] ; then \
+ $(CC) ${LWP_DBG} ${LWP_OPTMZ} -c -arch ppc -I${TOP_INCDIR} ${srcdir}/process.s -o process.ppc.o ; \
+ if [ -z "$${i386}" ] ; then \
+ ${MV} process.ppc.o process.o ; \
+ fi ; \
+ fi ; \
+ if [ -n "$${i386}" ] ; then \
+ $(CC) -x assembler-with-cpp -c -arch i386 -I${TOP_INCDIR} -I${srcdir} ${srcdir}/process.i386.s -o process.i386.o ; \
+ if [ -z "$${ppc}" ] ; then \
+ ${MV} process.i386.o process.o ; \
+ fi ; \
+ fi ; \
+ if [ -n "$${ppc}" -a -n "$${i386}" ] ; then \
+ lipo -create process.ppc.o process.i386.o -output process.o ;\
+ fi ;; \
i386_*bsd*) \
cp ${srcdir}/process.i386.s process.S ; \
${CCOBJ} -DIGNORE_STDS_H -E -I${srcdir} -I${TOP_INCDIR} process.S > process.ss ; \
#ifdef __s390__
#define MINFRAME 96
#define STACK_ALIGN 8
+#elif defined(AFS_DARWIN_ENV)
+#define STACK_ALIGN 16
#else
#define STACK_ALIGN 4
#endif
return LWP_ENOMEM;
}
if (stacksize < MINSTACK)
+#ifdef AFS_DARWIN_ENV
+ stacksize = 1008;
+#else /* !AFS_DARWIN_ENV */
stacksize = 1000;
+#endif /* !AFS_DARWIN_ENV */
else
stacksize =
STACK_ALIGN * ((stacksize + STACK_ALIGN - 1) / STACK_ALIGN);
stackptr -= stacksize;
stackmemory = stackptr;
#else
- if ((stackmemory = (char *)malloc(stacksize + 7)) == NULL) {
+#ifdef AFS_DARWIN_ENV
+ if ((stackmemory = (char *)malloc(stacksize + STACK_ALIGN - 1)) == NULL)
+#else /* !AFS_DARWIN_ENV */
+ if ((stackmemory = (char *)malloc(stacksize + 7)) == NULL)
+#endif /* !AFS_DARWIN_ENV */
+ {
Set_LWP_RC();
return LWP_ENOMEM;
}
/* Round stack pointer to byte boundary */
+#ifdef AFS_DARWIN_ENV
+ stackptr = (char *)(STACK_ALIGN * (((long)stackmemory + STACK_ALIGN - 1) / STACK_ALIGN));
+#else /* !AFS_DARWIN_ENV */
stackptr = (char *)(8 * (((long)stackmemory + 7) / 8));
+#endif /* !AFS_DARWIN_ENV */
#endif
if (priority < 0 || priority >= MAX_PRIORITIES) {
Set_LWP_RC();
stackptr + MINFRAME);
#else
#if defined(AFS_SGI62_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#ifdef sys_x86_darwin_80
+ savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - 16 - sizeof(void *)); /* 16 = 2 * jmp_buf_type */
+#else /* !sys_x86_darwin_80 */
/* Need to have the sp on an 8-byte boundary for storing doubles. */
savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - 16); /* 16 = 2 * jmp_buf_type */
+#endif /* !sys_x86_darwin_80 */
#else
#if defined(AFS_SPARC64_LINUX20_ENV) || defined(AFS_SPARC_LINUX20_ENV)
savecontext(Create_Process_Part2, &temp2->context, stackptr + stacksize - 0x40); /* lomgjmp does something
INCDIRS= -I.. -I${DESTDIR}/include
LIBS= ../liblwp.a
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${LDIRS} ${XCFLAGS} ${ARCHFLAGS}
system noversion: test
#
# @APPLE_LICENSE_HEADER_END@
-AFSINCLUDE = /Library/OpenAFS/Tools/include
-CFLAGS = -O -I$(AFSINCLUDE)
+# We assume the either we are in src/packaging/MacOS (so ../.. should work
+# with #include <afs/sysctl.h>, or we are in a directory where configure
+# was run, so the afs/sysctl.h should be in the include subdirectory
+AFSINCLUDE = -I../.. -Iinclude
+CFLAGS = -Os $(AFSINCLUDE) $(ARCHFLAGS)
LIBS = -framework Foundation
ALL = afssettings
+DIR = $(shell dirname $(MAKEFILE_LIST))
all: $(ALL)
-afssettings : afssettings.m
+afssettings : $(DIR)/afssettings.m
cc $(CFLAGS) -o $@ $^ $(LIBS)
clean:
- @rm -f *.o $(ALL)
+ @rm -f $(ALL)
# this is a new install, or an upgrade from pre-1.2.7
echo "Installing new CellServDB"
cp CellServDB.master CellServDB.master.last
- cp CellServDB.master CellServDB
+ if [ ! -e CellServDB ]; then
+ cp CellServDB.master CellServDB
+ fi
fi
fi
/*
- * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003, 2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
{@"Darwin14", AFS_SC_DARWIN_14, TypeNode, NULL},
{@"Darwin60", AFS_SC_DARWIN_60, TypeNode, NULL},
{@"Darwin70", AFS_SC_DARWIN_70, TypeNode, NULL},
+ {@"Darwin80", AFS_SC_DARWIN_80, TypeNode, NULL},
+ {@"Darwin90", AFS_SC_DARWIN_90, TypeNode, NULL},
{NULL, 0, 0, NULL}
};
Setting s_first[] = {
int i;
len = sizeof(max);
- if(sysctl(oidmax, 3, &max, &len, NULL, NULL) < 0)
+ if(sysctl(oidmax, 3, &max, &len, NULL, 0) < 0)
err(1, "sysctl VFS_MAXTYPENUM");
for(i = max; --i >= 0; ) {
oidvfs[3] = i;
len = sizeof(conf);
- if(sysctl(oidvfs, 4, &conf, &len, NULL, NULL) < 0)
+ if(sysctl(oidvfs, 4, &conf, &len, NULL, 0) < 0)
continue;
if(strcmp("afs", conf.vfc_name) == 0) {
s_top.selector = conf.vfc_typenum;
#!/bin/sh
-# Portions Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+# Portions Copyright (c) 2003, 2006 Apple Computer, Inc. All rights reserved.
if [ -z "$1" ]; then
- echo Usage: buildpkg binary-dir
- exit 1
+ echo Usage: buildpkg binary-dir
+ echo ' or'
+ echo 'Usage: buildpkg [-firstpass] binary-dir'
+ echo ' (customize pkgroot)'
+ echo ' buildpkg [-secondpass]'
+ exit 1
fi
-BINDEST=$1
-RESSRC=`pwd`
+
+firstpass=yes
+secondpass=yes
+if [ "$1" = "-firstpass" ]; then
+ secondpass=no
+ shift
+elif [ "$1" = "-secondpass" ]; then
+ firstpass=no
+ shift
+fi
+
+BINDEST=`cd $1 && pwd`
+CURDIR=`pwd`
+RESSRC=`dirname $0`
+RESSRC=`cd $RESSRC && pwd`
majorvers=`uname -r | sed 's/\..*//'`
+
+PKGROOT=$CURDIR/pkgroot
+PKGRES=$CURDIR/pkgres
if [ $majorvers -ge 7 ]; then
SEP=:
package=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
fi
fi
-if [ -x /usr/bin/curl ]; then
+if [ $firstpass = yes ]; then
+ if [ -x /usr/bin/curl ]; then
# /usr/bin/curl -f -O http://www.central.org/dl/cellservdb/CellServDB
- /usr/bin/curl -f -O http://dl.central.org/dl/cellservdb/CellServDB
-fi
+ /usr/bin/curl -f -O http://dl.central.org/dl/cellservdb/CellServDB
+ fi
-if [ ! -f CellServDB ]; then
- echo "A CellServDB file must be placed in the working directory"
- die=1
-fi
-FILES="ReadMe.rtf License.rtf CellServDB.list OpenAFS.info OpenAFS.post_install OpenAFS.pre_upgrade csrvdbmerge.pl 2.0.txt"
-for f in $FILES; do
- if [ ! -f $f ]; then
- echo "file missing: " $f
- die=1
- fi
-done
-if [ "$die" ]; then
- echo "Correct above errors; then retry"
- exit 1
-fi
-if [ ! -f $BINDEST/bin/translate_et ]; then
- die=1
-fi
-if [ ! -f $BINDEST/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs ]; then
- die=1
-fi
-if [ "$die" ]; then
- echo $BINDEST " is not a valid binary dir. it should be the result of"
- echo "make dest"
- exit 1
-fi
+ if [ ! -f CellServDB ]; then
+ echo "A CellServDB file must be placed in the working directory"
+ die=1
+ fi
+ FILES="ReadMe.rtf License.rtf CellServDB.list OpenAFS.info OpenAFS.post_install OpenAFS.pre_upgrade csrvdbmerge.pl 2.0.txt"
+ for f in $FILES; do
+ if [ ! -f $RESSRC/$f ]; then
+ echo "file missing: " $RESSRC/$f
+ die=1
+ fi
+ done
+ if [ "$die" ]; then
+ echo "Correct above errors; then retry"
+ exit 1
+ fi
+ if [ ! -f $BINDEST/bin/translate_et ]; then
+ die=1
+ fi
+ if [ ! -f $BINDEST/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs ]; then
+ die=1
+ fi
+ if [ "$die" ]; then
+ echo $BINDEST " is not a valid binary dir. it should be the result of"
+ echo "make dest"
+ exit 1
+ fi
-PKGROOT=$RESSRC/pkgroot
-PKGRES=$RESSRC/pkgres
-rm -rf pkgroot pkgres
-mkdir -p $PKGROOT $PKGRES
-
-mkdir $PKGROOT/Library
-chown -R root${SEP}admin $PKGROOT
-chmod -R 775 $PKGROOT
-mkdir $PKGROOT/Library/OpenAFS $PKGROOT/Library/OpenAFS/Tools
-cd $BINDEST
-pax -rw * $PKGROOT/Library/OpenAFS/Tools
-cd $RESSRC
-mkdir $PKGROOT/Library/StartupItems
-mkdir $PKGROOT/Library/StartupItems/OpenAFS
-cp $BINDEST/root.client/usr/vice/etc/afs.rc $PKGROOT/Library/StartupItems/OpenAFS/OpenAFS
-chmod a+x $PKGROOT/Library/StartupItems/OpenAFS/OpenAFS
-cp $BINDEST/root.client/usr/vice/etc/StartupParameters.plist $PKGROOT/Library/StartupItems/OpenAFS/StartupParameters.plist
-chown -R root${SEP}admin $PKGROOT/Library
-chmod -R o-w $PKGROOT/Library
-chmod -R g+w $PKGROOT/Library
-chown -R root${SEP}wheel $PKGROOT/Library/StartupItems
-chmod -R og-w $PKGROOT/Library/StartupItems
-chown -R root${SEP}wheel $PKGROOT/Library/OpenAFS/Tools
-chmod -R og-w $PKGROOT/Library/OpenAFS/Tools
-
-mkdir $PKGROOT/private $PKGROOT/private/var $PKGROOT/private/var/db
-mkdir $PKGROOT/private/var/db/openafs $PKGROOT/private/var/db/openafs/cache
-mkdir $PKGROOT/private/var/db/openafs/etc $PKGROOT/private/var/db/openafs/etc/config
-cp $RESSRC/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master
-echo openafs.org > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample
-if [ $majorvers -ge 7 ]; then
- echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
- make AFSINCLUDE=$BINDEST/include
- cp afssettings $PKGROOT/private/var/db/openafs/etc/config
- cp settings.plist $PKGROOT/private/var/db/openafs/etc/config/settings.plist.orig
- make clean
-else
- echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
-fi
-echo '-afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample
+ rm -rf $PKGROOT
+ mkdir $PKGROOT
+
+ mkdir -p $PKGROOT/Library
+ chown root${SEP}admin $PKGROOT
+ chmod 775 $PKGROOT $PKGROOT/Library
+ mkdir -p $PKGROOT/Library/OpenAFS/Tools
+ (cd $BINDEST && pax -rw * $PKGROOT/Library/OpenAFS/Tools)
+ cd $RESSRC
+ mkdir -p $PKGROOT/Library/StartupItems/OpenAFS
+ cp $BINDEST/root.client/usr/vice/etc/afs.rc $PKGROOT/Library/StartupItems/OpenAFS/OpenAFS
+ chmod a+x $PKGROOT/Library/StartupItems/OpenAFS/OpenAFS
+ cp $BINDEST/root.client/usr/vice/etc/StartupParameters.plist $PKGROOT/Library/StartupItems/OpenAFS/StartupParameters.plist
+ chown -R root${SEP}admin $PKGROOT/Library
+ chmod -R o-w $PKGROOT/Library
+ chmod -R g+w $PKGROOT/Library
+ chown -R root${SEP}wheel $PKGROOT/Library/StartupItems
+ chmod -R og-w $PKGROOT/Library/StartupItems
+ chown -R root${SEP}wheel $PKGROOT/Library/OpenAFS/Tools
+ chmod -R og-w $PKGROOT/Library/OpenAFS/Tools
+
+ mkdir -p $PKGROOT/private/var/db/openafs/cache
+ mkdir -p $PKGROOT/private/var/db/openafs/etc/config
+ cp $CURDIR/CellServDB $PKGROOT/private/var/db/openafs/etc/CellServDB.master
+ echo openafs.org > $PKGROOT/private/var/db/openafs/etc/ThisCell.sample
+ if [ $majorvers -ge 7 ]; then
+ echo /afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
+ (cd $CURDIR && \
+ make -f $RESSRC/Makefile AFSINCLUDE="-I$BINDEST/include" && \
+ cp afssettings $PKGROOT/private/var/db/openafs/etc/config && \
+ make -f $RESSRC/Makefile clean)
+ cp settings.plist $PKGROOT/private/var/db/openafs/etc/config/settings.plist.orig
+ else
+ echo /Network/afs:/var/db/openafs/cache:30000 > $PKGROOT/private/var/db/openafs/etc/cacheinfo.sample
+ fi
+ echo '-afsdb -stat 2000 -dcache 800 -daemons 3 -volumes 70 -dynroot -fakestat-all' > $PKGROOT/private/var/db/openafs/etc/config/afsd.options.sample
-strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs
+ strip -X -S $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext/Contents/MacOS/afs
-cp -RP $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext $PKGROOT/private/var/db/openafs/etc
-cp -RP $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/C $PKGROOT/private/var/db/openafs/etc
+ cp -RP $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/afs.kext $PKGROOT/private/var/db/openafs/etc
+ cp -RP $PKGROOT/Library/OpenAFS/Tools/root.client/usr/vice/etc/C $PKGROOT/private/var/db/openafs/etc
-chown -R root${SEP}wheel $PKGROOT/private
-chmod -R og-w $PKGROOT/private
-chmod og-rx $PKGROOT/private/var/db/openafs/cache
+ chown -R root${SEP}wheel $PKGROOT/private
+ chmod -R og-w $PKGROOT/private
+ chmod og-rx $PKGROOT/private/var/db/openafs/cache
-mkdir $PKGROOT/usr $PKGROOT/usr/bin $PKGROOT/usr/sbin
+ mkdir -p $PKGROOT/usr/bin $PKGROOT/usr/sbin
-BINLIST="fs klog klog.krb pagsh pagsh.krb pts sys tokens tokens.krb unlog unlog.krb aklog"
+ BINLIST="fs klog klog.krb pagsh pagsh.krb pts sys tokens tokens.krb unlog unlog.krb aklog"
# Should these be linked into /usr too?
-OTHER_BINLIST="bos cmdebug rxgen translate_et udebug xstat_cm_test xstat_fs_test"
-OTHER_ETCLIST="vos rxdebug"
+ OTHER_BINLIST="bos cmdebug rxgen translate_et udebug xstat_cm_test xstat_fs_test"
+ OTHER_ETCLIST="vos rxdebug"
-for f in $BINLIST; do
- ln -s ../../Library/OpenAFS/Tools/bin/$f $PKGROOT/usr/bin/$f
-done
-ln -s ../../Library/OpenAFS/Tools/bin/kpasswd $PKGROOT/usr/bin/kpasswd.afs
+ for f in $BINLIST; do
+ ln -s ../../Library/OpenAFS/Tools/bin/$f $PKGROOT/usr/bin/$f
+ done
+ ln -s ../../Library/OpenAFS/Tools/bin/kpasswd $PKGROOT/usr/bin/kpasswd.afs
-ln -s ../../Library/OpenAFS/Tools/root.client/usr/vice/etc/afsd $PKGROOT/usr/sbin/afsd
+ ln -s ../../Library/OpenAFS/Tools/root.client/usr/vice/etc/afsd $PKGROOT/usr/sbin/afsd
-chown -R root${SEP}wheel $PKGROOT/usr
-chmod -R og-w $PKGROOT/usr
+ chown -R root${SEP}wheel $PKGROOT/usr
+ chmod -R og-w $PKGROOT/usr
+fi
-if [ $majorvers -ge 7 ]; then
- cp OpenAFS.post_install $PKGRES/postinstall
- cp OpenAFS.pre_upgrade $PKGRES/preupgrade
- cp OpenAFS.post_install $PKGRES/postupgrade
- if [ $majorvers -ge 8 ]; then
- cp InstallationCheck $PKGRES
- mkdir $PKGRES/English.lproj
- cp InstallationCheck $PKGRES/English.lproj
- chmod a+x $PKGRES/InstallationCheck
+if [ $secondpass = yes ]; then
+ rm -rf $PKGRES
+ mkdir $PKGRES
+
+ cd $RESSRC
+ if [ $majorvers -ge 7 ]; then
+ cp OpenAFS.post_install $PKGRES/postinstall
+ cp OpenAFS.pre_upgrade $PKGRES/preupgrade
+ cp OpenAFS.post_install $PKGRES/postupgrade
+ if [ $majorvers -ge 8 ]; then
+ cp InstallationCheck $PKGRES
+ mkdir -p $PKGRES/English.lproj
+ cp InstallationCheck $PKGRES/English.lproj
+ chmod a+x $PKGRES/InstallationCheck
+ fi
+ chmod a+x $PKGRES/postinstall $PKGRES/postupgrade $PKGRES/preupgrade
+ else
+ cp OpenAFS.post_install OpenAFS.pre_upgrade $PKGRES
+ cp OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade
+ chmod a+x $PKGRES/OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade $PKGRES/OpenAFS.pre_upgrade
fi
- chmod a+x $PKGRES/postinstall $PKGRES/postupgrade $PKGRES/preupgrade
-else
- cp OpenAFS.post_install OpenAFS.pre_upgrade $PKGRES
- cp OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade
- chmod a+x $PKGRES/OpenAFS.post_install $PKGRES/OpenAFS.post_upgrade $PKGRES/OpenAFS.pre_upgrade
-fi
-cp License.rtf ReadMe.rtf $PKGRES
-cp csrvdbmerge.pl $PKGRES
-chmod a+x $PKGRES/csrvdbmerge.pl
-cp CellServDB.list $PKGRES
-chown -R root${SEP}wheel $PKGRES
-rm -rf OpenAFS.pkg
-if [ $majorvers -ge 7 ]; then
- echo $package -build -p $RESSRC/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
- -i OpenAFS.Info.plist -d OpenAFS.Description.plist
- $package -build -p $RESSRC/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
- -i OpenAFS.Info.plist -d OpenAFS.Description.plist
-else
- echo $package $PKGROOT OpenAFS.info -r $PKGRES
- $package $PKGROOT OpenAFS.info -r $PKGRES
- #old versions of package didn't handle this properly
- if [ ! -r OpenAFS.pkg/Contents ]; then
- mkdir OpenAFS.pkg/Contents OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/OpenAFS.* OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/*.rtf OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/csrvdbmerge.pl OpenAFS.pkg/Contents/Resources
- mv OpenAFS.pkg/CellServDB* OpenAFS.pkg/Contents/Resources
+ cp License.rtf ReadMe.rtf $PKGRES
+ cp csrvdbmerge.pl $PKGRES
+ chmod a+x $PKGRES/csrvdbmerge.pl
+ cp CellServDB.list $PKGRES
+ chown -R root${SEP}wheel $PKGRES
+ rm -rf $CURDIR/OpenAFS.pkg
+ if [ $majorvers -ge 7 ]; then
+ echo $package -build -p $CURDIR/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
+ -i OpenAFS.Info.plist -d OpenAFS.Description.plist
+ $package -build -p $CURDIR/OpenAFS.pkg -f $PKGROOT -r $PKGRES \
+ -i OpenAFS.Info.plist -d OpenAFS.Description.plist
+ else
+ echo $package $PKGROOT $RESSRC/OpenAFS.info -r $PKGRES
+ (cd $CURDIR && $package $PKGROOT $RESSRC/OpenAFS.info -r $PKGRES)
+ #old versions of package didn't handle this properly
+ if [ ! -r $CURDIR/OpenAFS.pkg/Contents ]; then
+ mkdir -p $CURDIR/OpenAFS.pkg/Contents/Resources
+ mv $CURDIR/OpenAFS.pkg/OpenAFS.* $CURDIR/OpenAFS.pkg/Contents/Resources
+ mv $CURDIR/OpenAFS.pkg/*.rtf $CURDIR/OpenAFS.pkg/Contents/Resources
+ mv $CURDIR/OpenAFS.pkg/csrvdbmerge.pl $CURDIR/OpenAFS.pkg/Contents/Resources
+ mv $CURDIR/OpenAFS.pkg/CellServDB* $CURDIR/OpenAFS.pkg/Contents/Resources
+ fi
fi
-fi
-rm -rf pkgroot pkgres
-mkdir dmg
-mv OpenAFS.pkg dmg
-rm -rf OpenAFS.dmg
-hdiutil create -srcfolder dmg -volname OpenAFS -anyowners OpenAFS.dmg
-rm -rf dmg
-# Unfortunately, sudo sets $USER to root, so I can't chown the
-#.pkg dir back to myself
-#chown -R $USER OpenAFS.pkg
+ rm -rf $PKGROOT $PKGRES
+ mkdir $CURDIR/dmg
+ mv $CURDIR/OpenAFS.pkg $CURDIR/dmg
+ rm -rf $CURDIR/OpenAFS.dmg
+ hdiutil create -srcfolder $CURDIR/dmg -volname OpenAFS -anyowners $CURDIR/OpenAFS.dmg
+ rm -rf $CURDIR/dmg
+ # Unfortunately, sudo sets $USER to root, so I can't chown the
+ #.pkg dir back to myself
+ #chown -R $USER $CURDIR/OpenAFS.pkg
+else
+ echo "First pass completed. Customize pkgroot and then run:"
+ echo " $0 -secondpass"
+fi
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS = $(DBUG) -I${SRCDIR}/include ${XCFLAGS}
+CFLAGS = $(DBUG) -I${SRCDIR}/include ${XCFLAGS} ${ARCHFLAGS}
########################################################################
# build tests
thdr.version.epoch = htonl(2);
thdr.version.counter = htonl(0);
thdr.magic = htonl(UBIK_MAGIC);
- thdr.size = htonl(HDRSIZE);
+ thdr.size = htons(HDRSIZE);
lseek(dbase_fd, 0, 0);
write(dbase_fd, &thdr, sizeof(thdr));
fsync(dbase_fd);
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} -DRXDEBUG
+CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG
#
# Generic xdr objects (or, at least, xdr stuff that's not newly defined for rx).
LIBRX=@TOP_OBJDIR@/lib/librx.a
DESTDIR=@srcdir@
LIBS=${LIBRX} ${TOP_OBJDIR}/lib/liblwp.a ${TOP_OBJDIR}/lib/libafsutil.a
-CFLAGS=-g ${COMMON_INCL} -DDEBUG ${XCFLAGS}
+CFLAGS=-g ${COMMON_INCL} -DDEBUG ${XCFLAGS} ${ARCHFLAGS}
all: bulk_client bulk_server
DESTDIR=/usr/andy/
INSTALL=${SRCDIR}/bin/install
LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} ${ARCHFLAGS}
all: bulk_client bulk_server
DESTDIR=/usr/andy/
INSTALL=${SRCDIR}/bin/install
LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I.. -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} ${ARCHFLAGS}
all: sample_client sample_server
DESTDIR=/usr/andy/
INSTALL=${SRCDIR}/bin/install
LIBS=${LIBRX} ${SRCDIR}/lib/liblwp.a
-CFLAGS=${DBG} -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS}
+CFLAGS=${DBG} -I. -I${SRCDIR}/include -DDEBUG ${XCFLAGS} ${ARCHFLAGS}
all: sample_client sample_server
LIBS= ${TOP_LIBDIR}/libcmd.a ../librx.a ${TOP_LIBDIR}/liblwp.a \
${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
-CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} -DRXDEBUG ${LDIRS} ${XCFLAGS} ${ARCHFLAGS}
RXTESTOBJS = testclient.o testserver.o kstest.o kctest.o
#define mem_free(ptr, bsize) free(ptr)
#endif
-#if defined(AFS_AMD64_LINUX24_ENV) || (defined(KERNEL) && !defined(UKERNEL))
+#if defined(AFS_AMD64_LINUX24_ENV) || defined(AFS_DARWIN_ENV) || (defined(KERNEL) && !defined(UKERNEL))
#define xdr_void afs_xdr_void
#define xdr_int afs_xdr_int
#define xdr_u_int afs_xdr_u_int
#define xdr_vector afs_xdr_vector
#define xdr_int64 afs_xdr_int64
#define xdr_uint64 afs_xdr_uint64
+#define xdr_pointer afs_xdr_pointer
#endif
#ifdef KERNEL
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} -DRXDEBUG
+CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG
LIBS=${TOP_LIBDIR}/librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libafsutil.a
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-g -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
HEADERS = ../rxkad.h stress.h stress_internal.h stress_errs.h
return (-1);
}
memcpy(&(curr_skt->sin_addr.s_addr), he->h_addr, 4);
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ curr_skt->sin_family = AF_INET; /*Internet family */
+#else
curr_skt->sin_family = htons(AF_INET); /*Internet family */
+#endif
curr_skt->sin_port = htons(7000); /*FileServer port */
/*
# Note that if afskauthlib.so gets installed on a client
# machine then that will be used ..
#
-CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS = ${OPTIMIZE} ${XLDFLAGS}
+CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+LDFLAGS = ${OPTIMIZE} ${XLDFLAGS} ${ARCHFLAGS}
LIBDIR=${TOP_LIBDIR}/
AFSLIBS=${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a ${LIBDIR}/libubik.a \
${TOP_LIBDIR}/libauth.a ${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \
clean:
$(RM) -f test-reauth libafssiad.so libafssiad.krb.so *.s *.o *.b core *~ *.com *.ld AFS_component_version_number.c
-CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
${DEST}/lib/afs/libafssiad.so: libafssiad.so
${INSTALL} $? $@
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
SFLAGS=-I${TOP_INCDIR}
LIBS=libsys.a ${TOP_LIBDIR}/librx.a libsys.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/util.a ${XLIBS}
RMTOBJS=rmtsysnet.o rmtsysc.o rmtsys.cs.o rmtsys.xdr.o rmtsys.ss.o rmtsyss.o
LIBAFSSETPAG = libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}
+LIBAFSSETPAG_DARWIN = libafssetpag.${LIBAFSSETPAGMAJOR}.${SHLIB_SUFFIX}
all: \
- rmtsysd \
- pagsh \
- pagsh.krb \
- ${TOP_INCDIR}/afs/afssyscalls.h \
- ${TOP_INCDIR}/afs/afs.exp \
- ${TOP_INCDIR}/afs/xfsattrs.h \
- ${TOP_LIBDIR}/afs.exp \
- ${TOP_LIBDIR}/libsys.a \
- ${TOP_LIBDIR}/${LIBAFSSETPAG} \
- ${KERNELDIR}/afs \
- ${KERNELDIR}/afs/xfsattrs.h \
- ${UKERNELDIR}/afs \
- ${UKERNELDIR}/afs/afsl.exp
+ rmtsysd \
+ pagsh \
+ pagsh.krb \
+ ${TOP_INCDIR}/afs/afssyscalls.h \
+ ${TOP_INCDIR}/afs/afs.exp \
+ ${TOP_INCDIR}/afs/xfsattrs.h \
+ ${TOP_LIBDIR}/afs.exp \
+ ${TOP_LIBDIR}/libsys.a \
+ ${KERNELDIR}/afs \
+ ${KERNELDIR}/afs/xfsattrs.h \
+ ${UKERNELDIR}/afs \
+ ${UKERNELDIR}/afs/afsl.exp
+ @set -x; case ${SYS_NAME} in \
+ *_darwin_*) \
+ ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}';; \
+ *) \
+ ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG}';; \
+ esac
libsys.a: ${OBJECTS} ${RMTOBJS} afsl.exp AFS_component_version_number.o
-$(RM) -f $@
$(AR) crv $@ ${OBJECTS} ${RMTOBJS} \
AFS_component_version_number.o ${LIBSYS_AIX_EXP}
$(RANLIB) $@
- case "${SYS_NAME}" in \
+ @set -x; case "${SYS_NAME}" in \
rs_aix*) \
$(AR) crv $@ afsl.exp;; \
esac
${LIBAFSSETPAG}: ${SHLIBOBJS}
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
*_linux*) \
${SHLIB_LINKER} -Wl,-h,libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-o ${LIBAFSSETPAG} -Wl,--version-script=${srcdir}/mapfile \
${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
esac
+${LIBAFSSETPAG_DARWIN}: ${SHLIBOBJS}
+ ${SHLIB_LINKER} -o ${LIBAFSSETPAG_DARWIN} ${ARCHFLAGS} -install_name ${libdir}/${LIBAFSSETPAG_DARWIN} -compatibility_version ${LIBAFSSETPAGMAJOR} -current_version ${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR} ${SHLIBOBJS}
+
tests: pagsh pagsh.krb fixit iinc idec icreate iopen istat rmtsysd
syscall.o: syscall.s
- case "$(SYS_NAME)" in \
+ @set -x; case "$(SYS_NAME)" in \
sun4c_51 | sun4c_52 | sun4m_51 | sun4m_52 | sun4c_53 | sun4m_53 | sun4_53 | sun4_52 | sun4_54 | sun4c_54 | sun4m_54 | sun4x_5? | sun4x_5?? | sunx86_5? | sunx86_5?? ) \
/usr/ccs/lib/cpp -P ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \
as -o syscall.o syscall.ss; \
xfsinode: xfsinode.c AFS_component_version_number.c
- case "${SYS_NAME}" in \
+ @set -x; case "${SYS_NAME}" in \
sgi_62 | sgi_64 ) \
$(CC) -o xfsinode ${CFLAGS} ${srcdir}/xfsinode.c ${LIBS}
esac
${INSTALL} ${LIBAFSSETPAG} ${TOP_LIBDIR}/${LIBAFSSETPAG}
-ln -f -s ${LIBAFSSETPAG} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}
-ln -f -s ${LIBAFSSETPAG} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}
+
+${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
+ ${INSTALL} ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}
+ -ln -f -s ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/libafssetpag.${SHLIB_SUFFIX}
+ -ln -f -s ${LIBAFSSETPAG_DARWIN} ${TOP_LIBDIR}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX}
afs.exp: ${srcdir}/afs4.exp ${srcdir}/afs5.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix5* ) \
cp -p ${srcdir}/afs5.exp afs.exp ;; \
rs_aix* ) \
esac
afsl.exp: ${srcdir}/afsl4.exp ${srcdir}/afsl5.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix5* ) \
cp -p ${srcdir}/afsl5.exp afsl.exp ;; \
rs_aix* ) \
${INSTALL} $? $@
${TOP_INCDIR}/afs/afs.exp: afs.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix* ) \
${INSTALL} $? $@ ;; \
esac
${TOP_LIBDIR}/afs.exp: afs.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix* ) \
${INSTALL} $? $@ ;; \
esac
mkdir -p $@
${UKERNELDIR}/afs/afsl.exp: afsl.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix* ) \
${INSTALL} $? $@ ;; \
esac
${UKERNELDIR}/afs/afsl.exp
install: \
- ${DESTDIR}${libdir}/afs/libsys.a \
- ${DESTDIR}${libdir}/${LIBAFSSETPAG} \
- ${DESTDIR}${sbindir}/rmtsysd \
- ${DESTDIR}${includedir}/afs/afssyscalls.h \
- ${DESTDIR}${bindir}/pagsh \
- ${DESTDIR}${bindir}/pagsh.krb \
- ${DESTDIR}${includedir}/afs/afs.exp \
- ${DESTDIR}${includedir}/afs/xfsattrs.h
+ ${DESTDIR}${libdir}/afs/libsys.a \
+ ${DESTDIR}${sbindir}/rmtsysd \
+ ${DESTDIR}${includedir}/afs/afssyscalls.h \
+ ${DESTDIR}${bindir}/pagsh \
+ ${DESTDIR}${bindir}/pagsh.krb \
+ ${DESTDIR}${includedir}/afs/afs.exp \
+ ${DESTDIR}${includedir}/afs/xfsattrs.h
+ @set -x; case ${SYS_NAME} in \
+ *_darwin_*) \
+ ${MAKE} '${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}';; \
+ *) \
+ ${MAKE} '${DESTDIR}${libdir}/${LIBAFSSETPAG}';; \
+ esac
${DESTDIR}${libdir}/afs/libsys.a: libsys.a
${INSTALL} $? $@
-ln -f -s ${LIBAFSSETPAG} \
${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX}.${LIBAFSSETPAGMAJOR}
+${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}: ${LIBAFSSETPAG_DARWIN}
+ ${INSTALL} ${LIBAFSSETPAG_DARWIN} ${DESTDIR}${libdir}/${LIBAFSSETPAG_DARWIN}
+ -ln -f -s ${LIBAFSSETPAG_DARWIN} \
+ ${DESTDIR}${libdir}/libafssetpag.${SHLIB_SUFFIX} ; \
+ -ln -f -s ${LIBAFSSETPAG_DARWIN} \
+ ${DESTDIR}${libdir}/libafssetpag.${LIBAFSSETPAGMAJOR}.${LIBAFSSETPAGMINOR}.${SHLIB_SUFFIX} ;; \
+
${DESTDIR}${sbindir}/rmtsysd: rmtsysd
${INSTALL} -s $? $@
${INSTALL} -s $? $@
${DESTDIR}${includedir}/afs/afs.exp: afs.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix* ) \
${INSTALL} $? $@ ;; \
esac
${INSTALL} $? $@
dest: \
- ${DEST}/lib/afs/libsys.a \
- ${TOP_LIBDIR}/${LIBAFSSETPAG} \
- ${DEST}/etc/rmtsysd \
- ${DEST}/bin/pagsh \
- ${DEST}/bin/pagsh.krb \
- ${DEST}/include/afs/afssyscalls.h \
- ${DEST}/include/afs/afs.exp \
- ${DEST}/include/afs/xfsattrs.h
+ ${DEST}/lib/afs/libsys.a \
+ ${DEST}/etc/rmtsysd \
+ ${DEST}/bin/pagsh \
+ ${DEST}/bin/pagsh.krb \
+ ${DEST}/include/afs/afssyscalls.h \
+ ${DEST}/include/afs/afs.exp \
+ ${DEST}/include/afs/xfsattrs.h
+ @set -x; case ${SYS_NAME} in \
+ *_darwin_*) \
+ ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG_DARWIN}';; \
+ *) \
+ ${MAKE} '${TOP_LIBDIR}/${LIBAFSSETPAG}';; \
+ esac
${DEST}/lib/afs/libsys.a: libsys.a
${INSTALL} $? $@
${DEST}/include/afs/afs.exp: afs.exp
- case ${SYS_NAME} in \
+ @set -x; case ${SYS_NAME} in \
rs_aix* ) \
${INSTALL} $? $@ ;; \
esac
SHELL = /bin/sh
-CFLAGS = ${DBG} ${OPTMZ} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
-LDFLAGS=${XLDFLAGS}
+CFLAGS = ${DBG} ${OPTMZ} -I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
+LDFLAGS=${XLDFLAGS} ${ARCHFLAGS}
INCDIRS=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR}/afs -I${TOP_INCDIR}
INCLIBS=-L${SRCDIR}/lib/afs -L${TOP_LIBDIR}
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=${OPTIMIZE} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
AFSLIBS = ${TOP_LIBDIR}/libkauth.a ${TOP_LIBDIR}/libprot.a \
${TOP_LIBDIR}/libubik.a ${TOP_LIBDIR}/libauth.a \
${TOP_LIBDIR}/librxkad.a ${TOP_LIBDIR}/libsys.a \
thdr.version.epoch = htonl(aversion->epoch);
thdr.version.counter = htonl(aversion->counter);
thdr.magic = htonl(UBIK_MAGIC);
- thdr.size = htonl(HDRSIZE);
+ thdr.size = htons(HDRSIZE);
code = write(fd, &thdr, sizeof(thdr));
fsync(fd); /* preserve over crash */
uphys_close(fd);
-CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS}
+CFLAGS=-I. -I${srcdir} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS}
all: ${TOP_LIBDIR}/libusd.a ${TOP_INCDIR}/afs/usd.h
INCDIRS= -I${DESTDIR}/include -I..
-CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS}
+CFLAGS = $(DBUG) -I${SRCDIR}/include ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS}
LIBUSD=DEST/lib/afs/libusd.a
#####################################################################
all: uss
CFLAGS=-I. -I${srcdir} ${DBUG} -I${TOP_OBJDIR}/src/config \
- -I${TOP_INCDIR} -I. ${XCFLAGS}
+ -I${TOP_INCDIR} -I. ${XCFLAGS} ${ARCHFLAGS}
#
# Build targets
flipbase64.c \
afs_atomlist.c \
afs_lhash.c \
- snprintf.c
+ snprintf.c \
+ fstab.c
objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \
hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \
- dirpath.o fileutil.o netutils.o flipbase64.o \
+ dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \
afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o \
daemon.o rxkstats.o ${REGEX_OBJ}
snprintf.o: ${srcdir}/snprintf.c ${includes}
${CCOBJ} ${CFLAGS} -c ${srcdir}/snprintf.c
+fstab.o: ${srcdir}/fstab.c ${includes}
+ ${CCOBJ} ${CFLAGS} -c ${srcdir}/fstab.c
+
base64.o: ${srcdir}/base64.c ${includes}
${CCOBJ} ${CFLAGS} -c ${srcdir}/base64.c
assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \
hputil.c kreltime.c isathing.c get_krbrlm.c uuid.c serverLog.c \
dirpath.c fileutil.c netutils.c flipbase64.c \
- afs_atomlist.c afs_lhash.c snprintf.c
+ afs_atomlist.c afs_lhash.c snprintf.c fstab.c
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} ${DBG}
+CFLAGS = -I. -I.. -I${SRCDIR}/include ${XCFLAGS} ${ARCHFLAGS} ${DBG}
tests: test_ktime ktest dirpath_test
-o kdump.$$IP kdump.$$IP.o \
${TOP_LIBDIR}/libcmd64.a -lelf \
;; \
- *) ${CC} ${XCFLAGS} \
+ *) ${CC} ${XCFLAGS} ${ARCHFLAGS} \
$$CPU_KDEFS \
-o kdump.$$IP kdump.$$IP.o \
${TOP_LIBDIR}/libcmd.a -lelf \
${KERN_DBG} ${KERN_OPTMZ} -I${TOP_INCDIR} \
-I${TOP_OBJDIR}/src/config \
$$CPU_KDEFS \
- ${XCFLAGS} -DAFS_32BIT_KERNEL_ENV \
+ ${XCFLAGS} ${ARCHFLAGS} -DAFS_32BIT_KERNEL_ENV \
-c ${srcdir}/kdump.c -o kdump.$$IP.o \
;; \
esac || exit $$?; \
touch kdump.o ;; \
*) \
${CC} ${KERN_DBG} ${KERN_OPTMZ} -I${TOP_SRCDIR} -I${TOP_INCDIR}/afs \
- -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src -I${TOP_INCDIR} ${XCFLAGS} \
+ -I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} \
-o kdump.o -c ${srcdir}/kdump.c ;; \
esac ;
-I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \
-I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \
-I${TOP_SRCDIR} -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
- -I${TOP_INCDIR} ${XCFLAGS} -o kdump-linux-${LINUX_VERSION}.o \
+ -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} -o kdump-linux-${LINUX_VERSION}.o \
-c ${srcdir}/kdump.c
kdump-linux-@LINUX_VERSION@: kdump-linux-@LINUX_VERSION@.o
-I${TOP_OBJDIR}/src/afs/${MKAFS_OSTYPE} \
-I${TOP_OBJDIR}/src/config -I${TOP_OBJDIR}/src/libafs/afs \
-I${TOP_SRCDIR} -I${TOP_SRCDIR}/afs/${MKAFS_OSTYPE} \
- -I${TOP_INCDIR} ${XCFLAGS} -mno-fp-regs -ffixed-8 \
+ -I${TOP_INCDIR} ${XCFLAGS} ${ARCHFLAGS} -mno-fp-regs -ffixed-8 \
-o kdump-alpha_linux-${LINUX_VERSION}.o -c ${srcdir}/kdump.c ;; \
kdump-alpha_linux-@LINUX_VERSION@: kdump-alpha_linux-@LINUX_VERSION@.o
LDIRS= -L${TOP_LIBDIR} -L..
LIBS= -lsys -lubik -lvldb -lauth -lrxkad -ldes -lcom_err -lcmd -lrx -llwp -lafsutil
-CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS}
+CFLAGS = ${OPTIMIZE} ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS}
all test: fulltest owntest idtest getinitparams
srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config
-CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${VFSCK_CFLAGS}
+CFLAGS=${COMMON_CFLAGS} ${XCFLAGS} ${ARCHFLAGS} ${VFSCK_CFLAGS}
SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \
pass4.c pass5.c setup.c utilities.c ufs_subr.c \
CFLAGS=${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I. -I${TOP_INCDIR} \
-I${TOP_INCDIR}/afs -I${TOP_OBJDIR} -I${TOP_OBJDIR}/fsint\
- ${XCFLAGS} -DRXDEBUG -DNINTERFACE
+ ${XCFLAGS} ${ARCHFLAGS} -DRXDEBUG -DNINTERFACE
-LDFLAGS = ${DBUG} ${XLDFLAGS}
+LDFLAGS = ${DBUG} ${XLDFLAGS} ${ARCHFLAGS}
LIBS=${TOP_LIBDIR}/libacl.a \
${TOP_LIBDIR}/libvldb.a \
${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libdir.a \
${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libacl.a
-CFLAGS = ${COMMON_CFLAGS} -D${SYS_NAME} ${FSINCLUDES} ${XCFLAGS}
+CFLAGS = ${COMMON_CFLAGS} -D${SYS_NAME} ${FSINCLUDES} ${XCFLAGS} ${ARCHFLAGS}
PUBLICHEADERS=nfs.h vnode.h viceinode.h volume.h voldefs.h partition.h\
fssync.h ihandle.h namei_ops.h
VLIBOBJS=vnode.o volume.o vutil.o partition.o fssync.o purge.o \
clone.o nuke.o devname.o listinodes.o common.o ihandle.o \
- namei_ops.o fstab.o
+ namei_ops.o
OBJECTS=${VLIBOBJS} physio.o vol-salvage.o vol-info.o vol-dump.o vol-bless.o
${CC} ${LDFLAGS} -o gi gi.o ${TOP_LIBDIR}/libsys.a;; \
esac
-volinfo: vol-info.o physio.o ihandle.o fstab.o ${LIBS}
+volinfo: vol-info.o physio.o ihandle.o ${LIBS}
${CC} ${CFLAGS} -o volinfo vol-info.o physio.o \
- ihandle.o fstab.o ${LIBS} ${XLIBS}
+ ihandle.o ${LIBS} ${XLIBS}
vol-bless: vol-bless.o physio.o ihandle.o ${LIBS}
${CC} ${CFLAGS} -o vol-bless vol-bless.o physio.o ${LIBS} ${XLIBS}
INCDIRS=-I. -I.. -I${TOP_INCDIR} ${FSINCLUDES}
INSTALL = ${SRCDIR}/bin/install
-LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS}
+LDFLAGS = ${OPTMZ} ${PROF} ${LDIRS} ${XLDFLAGS} ${ARCHFLAGS}
LIBS=${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/vlib.a \
${TOP_LIBDIR}/util.a \
NAMEI_LIBS=../vlib.a ${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/liblwp.a
-CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} -g
+CFLAGS = -D${SYS_NAME} ${OPTMZ} ${INCDIRS} ${XCFLAGS} ${ARCHFLAGS} -g
PROGS = listVicepx
*/
curr_item = a_s->parms[P_CM_NAMES].items;
for (currCM = 0; currCM < numCMs; currCM++) {
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ CMSktArray[currCM].sin_family = AF_INET; /*Internet family */
+#else
CMSktArray[currCM].sin_family = htons(AF_INET); /*Internet family */
+#endif
CMSktArray[currCM].sin_port = htons(7001); /*Cache Manager port */
he = hostutil_GetHostByName(curr_item->data);
if (he == NULL) {
*/
curr_item = a_s->parms[P_FS_NAMES].items;
for (currFS = 0; currFS < numFSs; currFS++) {
+#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+ FSSktArray[currFS].sin_family = AF_INET; /*Internet family */
+#else
FSSktArray[currFS].sin_family = htons(AF_INET); /*Internet family */
+#endif
FSSktArray[currFS].sin_port = htons(7000); /*FileServer port */
he = hostutil_GetHostByName(curr_item->data);
if (he == NULL) {
git://git.openafs.org / openafs.git / commitdiff