sms@wlv.imsd.contel.com (Steven M. Schultz) (08/17/89)
Not quite sure why the 'netpup' stuff was carried along all this time, the skeletal support for PUP-1 has been long gone from sys/uipc_domain.c. Here are the diffs to complete the removal of the PUP-1 remnants, saves a few disc sectors and a few seconds when making a kernel. After applying these diffs to /sys/conf/{Make.net,Make.nsunix,config} do a "rm -r /sys/netpup" to complete the job. You'll probably also want to remove "npup.h" and edit the Makefiles for kernels already config'd. *** Make.net.old Thu Aug 11 21:08:47 1988 --- Make.net Sat Aug 12 21:19:15 1989 *************** *** 30,39 **** ip_output.o raw_ip.o tcp_debug.o tcp_input.o tcp_output.o \ tcp_subr.o tcp_timer.o tcp_usrreq.o udp_usrreq.o - N4= ../netpup - N4C= ${N4}/pup.c ${N4}/raw_pup.c - N4O= pup.o raw_pup.o - N5= ../netns N5C= ${N5}/ns.c ${N5}/ns_pcb.c ${N5}/ns_proto.c ${N5}/ns_error.c \ ${N5}/ns_ip.c ${N5}/ns_input.c ${N5}/ns_output.c \ --- 30,35 ---- *************** *** 55,63 **** SO= sys_socket.o sys_net.o uipc_domain.o uipc_mbuf.o uipc_proto.o \ uipc_socket.o uipc_socket2.o uipc_usrreq.o ! VPATH= ../net:../netimp:../netinet:../netpup:../netns:../pdpif:../sys ! SRCS= ${N1C} ${N2C} ${N3C} ${N4C} ${N5C} ${N6C} ${SC} ! OBJS= ${N1O} ${N2O} ${N3O} ${N4O} ${N5O} ${N6O} ${SO} .c.o: ${CC} ${CFLAGS} -S $*.c --- 51,59 ---- SO= sys_socket.o sys_net.o uipc_domain.o uipc_mbuf.o uipc_proto.o \ uipc_socket.o uipc_socket2.o uipc_usrreq.o ! VPATH= ../net:../netimp:../netinet:../netns:../pdpif:../sys ! SRCS= ${N1C} ${N2C} ${N3C} ${N5C} ${N6C} ${SC} ! OBJS= ${N1O} ${N2O} ${N3O} ${N5O} ${N6O} ${SO} .c.o: ${CC} ${CFLAGS} -S $*.c *** Make.nsunix.old Fri Aug 4 15:55:54 1989 --- Make.nsunix Sat Aug 12 21:19:50 1989 *************** *** 22,28 **** N2= ../netimp N3= ../netinet N4= ../netns - N5= ../netpup N6= ../pdpif S= ../sys U= ../pdpuba --- 22,27 ---- *************** *** 93,99 **** if_loop.o if_qe.o if_sl.o if_sri.o if_uba.o if_vv.o in.o \ in_cksum.o in_pcb.o in_proto.o ip_icmp.o ip_input.o ip_output.o \ ns.o ns_error.o ns_input.o ns_ip.o ns_output.o ns_pcb.o \ ! ns_proto.o pup.o raw_cb.o raw_imp.o raw_ip.o raw_pup.o \ raw_usrreq.o route.o spp_debug.o spp_usrreq.o sys_socket.o \ sys_net.o tcp_debug.o tcp_input.o tcp_output.o tcp_subr.o \ tcp_timer.o tcp_usrreq.o udp_usrreq.o uipc_domain.o uipc_mbuf.o \ --- 92,98 ---- if_loop.o if_qe.o if_sl.o if_sri.o if_uba.o if_vv.o in.o \ in_cksum.o in_pcb.o in_proto.o ip_icmp.o ip_input.o ip_output.o \ ns.o ns_error.o ns_input.o ns_ip.o ns_output.o ns_pcb.o \ ! ns_proto.o raw_cb.o raw_imp.o raw_ip.o \ raw_usrreq.o route.o spp_debug.o spp_usrreq.o sys_socket.o \ sys_net.o tcp_debug.o tcp_input.o tcp_output.o tcp_subr.o \ tcp_timer.o tcp_usrreq.o udp_usrreq.o uipc_domain.o uipc_mbuf.o \ *** config.old Fri Aug 26 14:18:16 1988 --- config Sat Aug 12 21:20:16 1989 *************** *** 243,249 **** echo "#define NLP $NLP" > ../$MACHINE/lp.h echo "#define LP_MAXCOL $LP_MAXCOL" >> ../$MACHINE/lp.h echo "#define NPTY $NPTY" > ../$MACHINE/pty.h - echo "#define NPUP $NPUP" > ../$MACHINE/npup.h echo "#define NQE $NQE" > ../$MACHINE/qe.h echo "#define NRAM $NRAM" > ../$MACHINE/ram.h echo "#define NRK $NRK" > ../$MACHINE/rk.h --- 243,248 ----