update to 2.3 based on netbsd stuff

[ppp.git] / freebsd-2.0 / kinstall.sh

diff --git a/freebsd-2.0/kinstall.sh b/freebsd-2.0/kinstall.sh
index 5af430a19c74c8dc024804997b04f74de2335f8e..bb0d88a9e424567be363c9b720fce557e03e6e24 100755 (executable)
--- a/freebsd-2.0/kinstall.sh
+++ b/freebsd-2.0/kinstall.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This script modifies the kernel sources in /sys to install
-# ppp-2.2.  It is intended to be run in the ppp-2.2 directory.
+# ppp-2.3.  It is intended to be run in the ppp-2.3 directory.
 #
 # Paul Mackerras       17-Mar-95
 
@@ -17,14 +17,13 @@ CONFIG=config
 # Copy new versions of files into /sys/net
 
 for f in net/if_ppp.h net/ppp-comp.h net/ppp_defs.h $SRC/bsd-comp.c \
-        $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/netisr.h $SRC/ppp_tty.c \
-        $SRC/pppcompress.c $SRC/pppcompress.h; do
+        $SRC/ppp-deflate.c $SRC/if_ppp.c $SRC/if_pppvar.h $SRC/ppp_tty.c \
+        $SRC/pppcompress.c $SRC/pppcompress.h common/zlib.c common/zlib.h; do
   dest=$SYS/net/$(basename $f)
   if [ -f $dest ]; then
     if ! cmp -s $f $dest; then
       echo "Copying $f to $dest"
-      mv -f $dest $dest.orig
-      echo " (old version saved in $dest.orig)"
+      mv -f $dest $dest.orig && echo " (old version saved in $dest.orig)"
       cp $f $dest
       DOMAKE=yes
     fi
@@ -41,21 +40,11 @@ if [ -f $SYS/conf/files ]; then
   if ! grep -q ppp_tty $SYS/conf/files; then
     echo "Patching $SYS/conf/files"
     patch -p -N -d $SYS/conf <$SRC/files.patch
-    if [ $CONFIG = config ]; then
-      DOCONF=yes
-    fi
-  fi
-fi
-
-# Add in patch to call PPP software interrupt routine.
-
-d=i386
-p=machdep.c
-if [ -f $ARCHDIR/$d/$p ]; then
-  if ! grep -q NETISR_PPP $ARCHDIR/$d/$p; then
-    echo "Patching $ARCHDIR/$d/$p"
-    patch -p -N -d $ARCHDIR/$d < $SRC/$p.patch
-    DOMAKE=yes
+    DOCONF=yes
+  elif ! grep -q ppp-deflate $SYS/conf/files; then
+    echo "Patching $SYS/conf/files"
+    patch -N $SYS/conf/$OLDFILES <$SRC/files-2.2.patch
+    DOCONF=yes
   fi
 fi
 
@@ -81,18 +70,18 @@ if [ $DOCONF ]; then
   echo
   echo "       cd $ARCHDIR/conf"
   echo "       /usr/sbin/$CONFIG $CONF"
-  echo "       cd ../compile/$CONF"
+  echo "       cd ../../compile/$CONF"
+  echo "       make depend"
   DOMAKE=yes
 elif [ $DOMAKE ]; then
   echo "You need to build a new kernel."
   echo "The procedure for doing this involves the following commands."
   echo
-  echo "       cd $ARCHDIR/compile/$CONF"
+  echo "       cd $SYS/compile/$CONF"
 fi
 if [ $DOMAKE ]; then
   echo "       make"
   echo
-  echo "Then copy the new kernel ($ARCHDIR/compile/$CONF/freebsd)"
-  echo "to /freebsd and reboot.  (Keep a copy of the old /freebsd,"
-  echo "just in case.)"
+  echo "Then copy the new kernel ($SYS/compile/$CONF/kernel) to /"
+  echo "and reboot.  (Keep a copy of the old /kernel, just in case.)"
 fi