Finish removing sunos 4.x references and build cruft
authorChas Williams (CONTRACTOR) <chas@cmf.nrl.navy.mil>
Mon, 19 Mar 2012 17:07:41 +0000 (13:07 -0400)
committerDerrick Brashear <shadow@dementix.org>
Mon, 26 Mar 2012 01:41:24 +0000 (18:41 -0700)
Also, fix afsxbsa.h to always include <time.h> since this should get
struct tm on any fairly modern operating system.

Change-Id: Idfb39f12d28a2a0aa470c8549e4149d0b2ccde9e
Change-Id: Ia1c563e5954c533f18bd56155f2ae1825813efe3
Reviewed-on: http://gerrit.openafs.org/6923
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

Makefile.in
README
acinclude.m4
src/afs/Makefile.in
src/butc/afsxbsa.h
src/venus/Makefile.in
src/vol/listinodes.c

index a8761ab..94de8b3 100644 (file)
@@ -356,7 +356,7 @@ bozo: cmd comerr audit auth kauth volser
 vfsck: vol
        +set -x; \
        case ${SYS_NAME} in \
-       sgi_* | *linux* | rs_aix* | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* | sun*_4* ) \
+       sgi_* | *linux* | rs_aix* | *_darwin* | ia64_hpux* | *fbsd* | *_obsd* | *_nbsd* ) \
                echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
@@ -494,7 +494,7 @@ libuafs: libuafs_setup vlserver_depinstall tvlserver_depinstall rx_depinstall fs
                rxstat_depinstall lwp_depinstall sys_depinstall cmd hcrypto
        +set -x; \
        case ${SYS_NAME} in \
-       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
+       hp_ux102* | *_obsd* | *_nbsd*| hp_ux11i | hp_ux112* | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
        * ) \
                ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \
diff --git a/README b/README
index 1e26205..c28e867 100644 (file)
--- a/README
+++ b/README
@@ -68,7 +68,6 @@ A  Configuring
       sgi_62, sgi_63, sgi_64, sgi_65 (file server not tested)
       sparc64_linux22, sparc64_linux24, sparc64_linux26
       sparc_linux22, sparc_linux24
-      sun4_413 (No client support, no fileserver support, db servers only)
       sun4x_58, sun4x_59, sun4x_510, sun4x_511
          (logging UFS not supported for mixed-use partitions containing
          client cache)
index 91231ba..b9cda09 100644 (file)
@@ -586,10 +586,6 @@ else
                sparc-sun-solaris2.11)
                        AFS_SYSNAME="sun4x_511"
                        ;;
-               sparc-sun-sunos4*)
-                       AFS_SYSNAME="sun4_413"
-                       enable_login="yes"
-                       ;;
                i386-pc-solaris2.8)
                        AFS_SYSNAME="sunx86_58"
                        ;;
index f2a365f..5e35972 100644 (file)
@@ -28,8 +28,6 @@ afszcm.cat: afs_trace.msf
        case ${SYS_NAME} in \
                sgi_* ) \
                        gencat -m afszcm.cat afs_trace.msf ;; \
-               sun*_4* ) \
-                       /usr/etc/gencat afszcm.cat afs_trace.msf ;; \
                *_linux* | *_umlinux* ) \
                        gencat --new afszcm.cat afs_trace.msf ;; \
                *_darwin_* ) \
index 4a05819..1ac3e57 100644 (file)
 extern "C" {
 #endif
 
-#if (SYS_V > 3) || defined(BERK4_2) || defined(SUN4)
-#include <sys/time.h>
-#else
 #include <time.h>
-#endif
 
 #ifdef bool_t
 #undef bool_t
index dd76819..fc27aa5 100644 (file)
@@ -114,28 +114,8 @@ whatfid.o: whatfid.c ${INCLS} AFS_component_version_number.c
 whatfid: whatfid.o ${LIBS}
        $(AFS_LDRULE) whatfid.o ${LIBS} $(LIB_roken) ${XLIBS}
 
-fstrace.o: fstrace.c AFS_component_version_number.c
-       $(Q)case ${SYS_NAME} in \
-               sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${DBG} ${OPTMZ} -I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c ${srcdir}/fstrace.c ;; \
-               sun*_4* ) \
-                       ${CC} ${DBG} ${OPTMZ} -I/usr/xpg2include -I/usr/5include -g -I${TOP_SRCDIR}/config -I${TOP_INCDIR} -I${TOP_INCDIR} -c fstrace.c ;; \
-               * ) \
-                       $(AFS_CCRULE_NOQ) $(srcdir)/fstrace.c ;; \
-       esac
-
 fstrace: fstrace.o
-       $(Q)case ${SYS_NAME} in \
-               sun4_411 | sun4c_411 | sun4m_412 ) \
-                       ${CCXPG2} ${AFS_CFLAGS} -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a;; \
-               sun*_4* ) \
-                       ${CC} -L/usr/xpg2lib -L/usr/5lib ${AFS_CFLAGS} -g -o fstrace fstrace.o ${TOP_LIBDIR}/libsys.a ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a $(TOP_LIBDIR)/libopr.a -lxpg ;; \
-               * ) \
-                       $(AFS_LDRULE_NOQ) fstrace.o ${TOP_LIBDIR}/libsys.a \
-                               ${TOP_LIBDIR}/libcmd.a ${TOP_LIBDIR}/util.a \
-                               $(TOP_LIBDIR)/libopr.a ${XLIBS} \
-                               $(LIB_roken);; \
-       esac
+       $(AFS_LDRULE) fstrace.o $(LIBS) $(LIB_roken) ${XLIBS}
 
 cmdebug.o: cmdebug.c ${INCLS} AFS_component_version_number.c
 
index 54ea83d..0bf3428 100644 (file)
@@ -25,7 +25,7 @@
 #include <ctype.h>
 
 #ifndef AFS_NAMEI_ENV
-#if defined(AFS_LINUX20_ENV) || defined(AFS_SUN4_ENV)
+#if defined(AFS_LINUX20_ENV)
 /* ListViceInodes
  *
  * Return codes: