hpux-1123-update-20031204

update the hpux 11.23 on ia64 support
don't build libuafs. make kernel modules build. fix afsd.

diff --git a/Makefile.in b/Makefile.in
index 3b0cbf7..defcb51 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -396,7 +396,7 @@ libuafs: libuafs_setup vlserver_depinstall rx_depinstall fsint_depinstall \
                rxstat_depinstall lwp_depinstall des
        set -x; \
        case ${SYS_NAME} in \
-       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | ia64_hpux1122) \
+       hp_ux102* | *_obsd* | sun*_4* | *_nbsd*| hp_ux11i | ia64_hpux112*) \
                echo Skipping libuafs for ${SYS_NAME} ;; \
        * ) \
                ${COMPILE_PART1} libuafs ${COMPILE_PART2} ;; \

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 96bc6c2..471aa59 100644 (file)
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -1064,7 +1064,7 @@ CheckCacheBaseDir(char *dir)
            return "unable to statfs cache base directory";
        }
 
-       if (sysfs(GETFSTYP, statfsbuf.f_fsid, name) != 0) {
+       if (sysfs(GETFSTYP, statfsbuf.f_fsid[1], name) != 0) {
            return "unable to determine filesystem type for cache base dir";
        }
 
@@ -2233,6 +2233,7 @@ HandleMTab()
     tmntent.mnt_freq = 1;
     tmntent.mnt_passno = 3;
 #ifdef AFS_HPUX_ENV
+    tmntent.mnt_type = "afs";
     tmntent.mnt_time = time(0);
     tmntent.mnt_cnode = 0;
 #endif

diff --git a/src/libafs/MakefileProto.HPUX.in b/src/libafs/MakefileProto.HPUX.in
index c6a1ba3..7ebfb16 100644 (file)
--- a/src/libafs/MakefileProto.HPUX.in
+++ b/src/libafs/MakefileProto.HPUX.in
@@ -226,7 +226,7 @@ ${LIBAFS}: $(AFSAOBJS) $(AFSNFSOBJS)
        $(AR) cru $@ $?
        $(RANLIB) $@
 <ia64_hpux1123>
-       -$(MODLINK) -o $@ $?
+       $(MODLINK) -o $@ $(AFSAOBJS) $(AFSNFSOBJS)
 <all>
 
 ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
@@ -234,7 +234,7 @@ ${LIBAFSNONFS}:  $(AFSAOBJS) $(AFSNONFSOBJS)
        $(AR) cru $@ $?
        $(RANLIB) $@
 <ia64_hpux1123>
-       -$(MODLINK) -o $@ $?
+       $(MODLINK) -o $@ $(AFSAOBJS) $(AFSNONFSOBJS)
 <all>
 
 <ia64_hpux1123>

diff --git a/src/libuafs/MakefileProto.HPUX.in b/src/libuafs/MakefileProto.HPUX.in
index 3c87487..6666c27 100644 (file)
--- a/src/libuafs/MakefileProto.HPUX.in
+++ b/src/libuafs/MakefileProto.HPUX.in
@@ -13,7 +13,7 @@ CC = /opt/ansic/bin/cc
 DEFINES= -D_REENTRANT -DKERNEL -DUKERNEL
 <hp_ux102 hp_ux110 hp_ux11i>
 KOPTS=-Wp,-H200000 -Wl,-a,archive +DA1.0 +z
-<ia64_hpux1122>
+<ia64_hpux1122 ia64_hpux1123>
 KOPTS=-Wp,-H200000 -Wl,-a,archive_shared
 <all>
 CFLAGS=-I. -I.. -I${TOP_OBJDIR}/src/config ${FSINCLUDES} $(DEFINES) $(KOPTS) ${DBUG}
@@ -22,7 +22,7 @@ WEBOPTS = -I../nsapi -DNETSCAPE_NSAPI -DNET_SSL -DXP_UNIX -DMCC_HTTPD
 
 <hp_ux102 hp_ux110 hp_ux11i>
 TEST_CFLAGS= -Wp,-H200000 +DA1.0 +z -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV
-<ia64_hpux1122>
+<ia64_hpux1122 ia64_hpux1123>
 TEST_CFLAGS= -Wp,-H200000 -D_POSIX_C_SOURCE=199506L -DAFS_PTHREAD_ENV -Dhpux -DAFS_HPUX_ENV
 <all>
 TEST_LDFLAGS=