From owner-freebsd-lite2 Mon Aug 26 04:23:17 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA05382 for lite2-outgoing; Mon, 26 Aug 1996 04:23:17 -0700 (PDT) Received: (from peter@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id EAA05371 for freebsd-lite2; Mon, 26 Aug 1996 04:23:15 -0700 (PDT) Date: Mon, 26 Aug 1996 04:23:15 -0700 (PDT) From: Peter Wemm Message-Id: <199608261123.EAA05371@freefall.freebsd.org> To: freebsd-lite2 Subject: cvs commit: src/sys/dev/vn vn.c src/sys/i386/conf Makefile.i386 src/sys/i386/isa spkr.c wd.c src/sys/kern init_main.c kern_exit.c kern_fork.c kern_shutdown.c uipc_syscalls.c vfs_bio.c vfs_subr.c vfs_vnops.c src/sys/miscfs/specfs spec_vnops.c src/sys/net route.c src/sys/nfs nfs.h nfs_nqlease.c nfs_serv.c nfs_subs.c src/sys/vm vm_object.c vm_object.h vnode_pager.c src/sys/netinet in.h in_pcb.c in_pcb.h ip_fw.h ip_input.c ip_output.c raw_ip.c src/sys/sys reboot.h systm.h vnode.h src/sys/ufs/ffs ffs_vfsops.c Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/08/26 04:23:14 Branch: sys/dev/vn LITE2 sys/i386/conf LITE2 sys/i386/isa LITE2 sys/kern LITE2 sys/miscfs/specfs LITE2 sys/net LITE2 sys/netinet LITE2 sys/nfs LITE2 sys/sys LITE2 sys/ufs/ffs LITE2 sys/vm LITE2 Modified: sys/dev/vn vn.c sys/i386/conf Makefile.i386 sys/i386/isa spkr.c wd.c sys/kern init_main.c kern_exit.c kern_fork.c kern_shutdown.c uipc_syscalls.c vfs_bio.c vfs_subr.c vfs_vnops.c sys/miscfs/specfs spec_vnops.c sys/net route.c sys/netinet in.h in_pcb.c in_pcb.h ip_fw.h ip_input.c ip_output.c raw_ip.c sys/nfs nfs.h nfs_nqlease.c nfs_serv.c nfs_subs.c sys/sys reboot.h systm.h vnode.h sys/ufs/ffs ffs_vfsops.c sys/vm vm_object.c vm_object.h vnode_pager.c Log: Merge changes from HEAD onto LITE2 branch Revision Changes Path 1.39.2.1 +2 -2 src/sys/dev/vn/vn.c 1.85.2.1 +3 -3 src/sys/i386/conf/Makefile.i386 1.25.2.1 +6 -3 src/sys/i386/isa/spkr.c 1.114.2.1 +35 -16 src/sys/i386/isa/wd.c 1.44.2.1 +2 -1 src/sys/kern/init_main.c 1.37.2.1 +23 -18 src/sys/kern/kern_exit.c 1.24.2.1 +38 -31 src/sys/kern/kern_fork.c 1.2.2.1 +66 -29 src/sys/kern/kern_shutdown.c 1.18.2.1 +3 -1 src/sys/kern/uipc_syscalls.c 1.95.2.1 +17 -2 src/sys/kern/vfs_bio.c 1.58.2.1 +103 -10 src/sys/kern/vfs_subr.c 1.25.4.1 +5 -56 src/sys/kern/vfs_vnops.c 1.30.2.1 +7 -2 src/sys/miscfs/specfs/spec_vnops.c 1.34.2.1 +2 -2 src/sys/net/route.c 1.19.2.1 +21 -5 src/sys/netinet/in.h 1.20.2.1 +3 -1 src/sys/netinet/in_pcb.c 1.11.4.1 +2 -1 src/sys/netinet/in_pcb.h 1.22.2.1 +1 -12 src/sys/netinet/ip_fw.h 1.45.2.1 +13 -1 src/sys/netinet/ip_input.c 1.41.2.1 +14 -1 src/sys/netinet/ip_output.c 1.33.2.1 +11 -4 src/sys/netinet/raw_ip.c 1.17.4.1 +2 -4 src/sys/nfs/nfs.h 1.19.4.1 +3 -3 src/sys/nfs/nfs_nqlease.c 1.30.2.1 +133 -153 src/sys/nfs/nfs_serv.c 1.31.2.1 +6 -49 src/sys/nfs/nfs_subs.c 1.11.4.1 +2 -1 src/sys/sys/reboot.h 1.41.2.1 +5 -3 src/sys/sys/systm.h 1.33.2.1 +6 -6 src/sys/sys/vnode.h 1.39.2.1 +16 -4 src/sys/ufs/ffs/ffs_vfsops.c 1.78.2.1 +10 -4 src/sys/vm/vm_object.c 1.28.2.1 +2 -1 src/sys/vm/vm_object.h 1.62.2.1 +2 -2 src/sys/vm/vnode_pager.c From owner-freebsd-lite2 Thu Aug 29 00:44:24 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA22259 for lite2-outgoing; Thu, 29 Aug 1996 00:44:24 -0700 (PDT) Received: from parkplace.cet.co.jp (parkplace.cet.co.jp [202.32.64.1]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id AAA22250 for ; Thu, 29 Aug 1996 00:44:19 -0700 (PDT) Received: from localhost (michaelh@localhost) by parkplace.cet.co.jp (8.7.5/CET-v2.1) with SMTP id HAA07822 for ; Thu, 29 Aug 1996 07:44:16 GMT Date: Thu, 29 Aug 1996 16:44:16 +0900 (JST) From: Michael Hancock To: freebsd-lite2@freefall.freebsd.org Subject: Multiple cvs tree management In-Reply-To: <199608261123.EAA05371@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-lite2@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk I'm using cvsup for current and I've been downloading stuff into /jaz/cvs; checking out/updating into /jaz/src; and doing some symlink stuff with /usr/src because of way 'config and make' work. I'm planning to make /jaz/lite2cvs, /jaz/lite2src, and using shell scripts to switch symlinks around. Is this similar to how others are doing it? Regards, Mike Hancock From owner-freebsd-lite2 Fri Aug 30 11:44:38 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id LAA13540 for lite2-outgoing; Fri, 30 Aug 1996 11:44:38 -0700 (PDT) Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id LAA13532 for ; Fri, 30 Aug 1996 11:44:32 -0700 (PDT) Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id CAA03103 for ; Sat, 31 Aug 1996 02:44:28 +0800 (WST) Message-Id: <199608301844.CAA03103@spinner.DIALix.COM> To: lite2@freebsd.org Subject: BTW, the merge repository is "go.." Date: Sat, 31 Aug 1996 02:44:27 +0800 From: Peter Wemm Sender: owner-lite2@freebsd.org X-Loop: FreeBSD.org Precedence: bulk Jeff Hsu asked me yesterday... it seems I forgot to mention that the repository is ready... :-] The development is intended to be done on the LITE2 branch. (just like RELENG_2_1_0). I have already done one merge to -current, the cvsup approach seems to be working.. So, assuming you sup it to your local machine to /home/lite2 (same as on freefall), you can: cvs -d /home/lite2 checkout -P -r LITE2 sys cvs -d /home/lite2 update -d -P -r LITE2 /home/lite2 is recorded in CVS/Root, so if your cwd is inside the checked out tree, things like 'cvs diff', 'cvs log' etc should automatically refer to the lite2 tree, overriding any $CVSROOT setting. If you are not running a -current cvs-1.8.1, you may be safer to set $CVSROOT to /home/lite2 (assuming that on your local machine). I strongly discourage using sup to fetch the source from freefall, as the entire lite2 tree gets regular tag changes, and sup refetches the entire source each time. cvsup does the right thing. The sup/cvsup "release" is "lite2". So, you use in your supfile: src-sys release=lite2 ..... (the rest same as src-sys for release=cvs) The repository on freefall is /home/lite2. If you have the same repository on both freefall and your local machine, you can do remote commits, but it may be safer to stick with 'cvs diff', copy-to-freefall, and commit on freefall. If you have a good link to freefall, you may like to try out using $CVSROOT = yourname@freefall.freebsd.org:/home/lite2 . You need a .rhosts of course, or set up ssh and set $CVS_RSH to "ssh". (ssh uses a RSA based authentication system, or .rhosts if freefall recognises your host's private key. ie: to use .rhosts with ssh, log into freefall and do a 'ssh yourhost.your.domain' so that it saves your host's key in ~/.ssh/known_hosts. Once that is done, ssh will emulate rsh entirely) Any questions? :-) -Peter From owner-freebsd-lite2 Sat Aug 31 02:42:29 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id CAA02021 for lite2-outgoing; Sat, 31 Aug 1996 02:42:29 -0700 (PDT) Received: from parkplace.cet.co.jp (parkplace.cet.co.jp [202.32.64.1]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id CAA02013 for ; Sat, 31 Aug 1996 02:42:21 -0700 (PDT) Received: from localhost (michaelh@localhost) by parkplace.cet.co.jp (8.7.5/CET-v2.1) with SMTP id JAA10680; Sat, 31 Aug 1996 09:42:08 GMT Date: Sat, 31 Aug 1996 18:42:08 +0900 (JST) From: Michael Hancock To: Peter Wemm cc: lite2@freebsd.org Subject: Re: BTW, the merge repository is "go.." In-Reply-To: <199608301844.CAA03103@spinner.DIALix.COM> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-lite2@freebsd.org X-Loop: FreeBSD.org Precedence: bulk On Sat, 31 Aug 1996, Peter Wemm wrote: > Any questions? :-) I have the cvs repository and plan to create the lite2 repository shortly, can we have 'base=/usr' in both cvsupfiles without having conflicts? From owner-freebsd-lite2 Sat Aug 31 03:04:25 1996 Return-Path: owner-lite2 Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id DAA02711 for lite2-outgoing; Sat, 31 Aug 1996 03:04:25 -0700 (PDT) Received: from spinner.DIALix.COM (spinner.DIALix.COM [192.203.228.67]) by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id DAA02705 for ; Sat, 31 Aug 1996 03:04:17 -0700 (PDT) Received: from spinner.DIALix.COM (localhost.DIALix.oz.au [127.0.0.1]) by spinner.DIALix.COM (8.7.5/8.7.3) with ESMTP id SAA00764; Sat, 31 Aug 1996 18:04:07 +0800 (WST) Message-Id: <199608311004.SAA00764@spinner.DIALix.COM> X-Mailer: exmh version 1.6.7 5/3/96 To: Michael Hancock cc: lite2@freebsd.org Subject: Re: BTW, the merge repository is "go.." In-reply-to: Your message of "Sat, 31 Aug 1996 18:42:08 +0900." Sender: owner-lite2@freebsd.org X-Loop: FreeBSD.org Precedence: bulk Date: Sat, 31 Aug 1996 18:04:07 +0800 From: Peter Wemm Michael Hancock wrote: > On Sat, 31 Aug 1996, Peter Wemm wrote: > > > Any questions? :-) > > I have the cvs repository and plan to create the lite2 repository shortly, > can we have 'base=/usr' in both cvsupfiles without having conflicts? No.. You most definately cannot have the same base for src-cvs and src-lite2.. They have both got the same file structure... Cheers, -Peter