Merge conflicts from new upstream

diff --git a/debian/changelog b/debian/changelog
index 6538e5984c51f7de7703538f5dd912e8bd74f306..133092278011ee628f898d00dfcec6b823365f17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
+openafs (1.0.snap20001106-1) unstable; urgency=low
+
+  * New Upstream version
+
+ --
+
 openafs (1.0.snap20001104-1) unstable; urgency=low
 
   * New upstream snapshot
   * Fix path to afsd in /etc/init.d/openafs-client
   * Build openafs module packages
 
- --  <hartmans@mit.edu>  Mon,  6 Nov 2000 09:39:11 -0500
+ --  Sam Hartman <hartmans@mit.edu>  Mon,  6 Nov 2000 09:39:11 -0500
 
 openafs (1.0.snap20001103-1) unstable; urgency=low
 

diff --git a/src/Makefile b/src/Makefile
index 93556779e925902389dac0cb492486d286af5c77..9efddf958a40940e9b7ae94ec0a9656d3e2d220e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -68,7 +68,7 @@ comerr: basics util
 cmd: basics comerr
        ${COMPILE_PART1} cmd ${COMPILE_PART2}
        @case ${SYS_NAME} in \
-       sgi_6* | sun4x_57 | hp_ux11* ) \
+       sgi_6* | sun4x_57 | sun4x_58 | hp_ux11* ) \
                ${COMPILE_PART1} cmd ${COMPILE_PART2} install64 ;; \
        esac
 
@@ -230,6 +230,7 @@ uss: des kauth project rx vlserver vol
 
 ntp: project volser
        case ${SYS_NAME} in \
+         sun4x_58 ) echo skipping ntp for ${SYS_NAME} ;; \
          *linux* ) echo skipping ntp for ${SYS_NAME} ;; \
          * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \
        esac
@@ -259,6 +260,8 @@ vfsck:      minproject vol
                echo skip vfsck for ${SYS_NAME} ;; \
        sun4x_57 )  \
                echo skip vfsck for ${SYS_NAME} ;; \
+       sun4x_58 )  \
+               echo skip vfsck for ${SYS_NAME} ;; \
         * ) \
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
        esac

diff --git a/src/libafs/MakefileProto.LINUX b/src/libafs/MakefileProto.LINUX
index 1e3eedd9f40d047f7e1b922d4f47b723695d6868..a9f01dcc095a6462102f4cc0462a7dacf03bc315 100644 (file)
--- a/src/libafs/MakefileProto.LINUX
+++ b/src/libafs/MakefileProto.LINUX
@@ -36,10 +36,17 @@ AFS_OS_NONFSOBJS =
 CC = gcc
 LD = ld
 # -Wall
+<i386_linux22 i386_linux24>
 CCFLAGS =   -O2 -fomit-frame-pointer \
        -fno-strength-reduce -pipe -m486 -malign-loops=2 -malign-jumps=2 \
        -malign-functions=2
 DEFINES = -D__KERNEL__  -DCPU=586 -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
+<ppc_linux22 ppc_linux24>
+CCFLAGS =   -O2 -fomit-frame-pointer -fno-strength-reduce \
+       -fno-strict-aliasing -fsigned-char -msoft-float -pipe \
+       -fno-builtin -ffixed-r2
+DEFINES = -D__KERNEL__  -D__powerpc__ -DKERNEL -D_KERNEL -DMODULE ${SMP_DEF}
+<all>
 INCLUDES = -I. -I../
 
 CFLAGS = $(CCFLAGS) $(DEFINES) $(INCLUDES)
@@ -84,7 +91,11 @@ ${COMPDIRS}:
                rm -f sys; \
                ln -s $${IDIR} sys; \
                rm -f asm; \
+<i386_linux22 i386_linux24>
                ln -s ${LINUX_SRCDIR}/include/asm-i386 asm ; \
+<ppc_linux22 ppc_linux24>
+               ln -s ${LINUX_SRCDIR}/include/asm-ppc asm ; \
+<all>
                for m in ${MPS} ; do \
                        KDIR=${KOBJ}-$$m ; \
                        echo Building in directory: $${KDIR} ; \