From owner-cvs-all Sun Jul 15 2:58:23 2001 Delivered-To: cvs-all@freebsd.org Received: from mailman.zeta.org.au (mailman.zeta.org.au [203.26.10.16]) by hub.freebsd.org (Postfix) with ESMTP id C97C237B403; Sun, 15 Jul 2001 02:58:14 -0700 (PDT) (envelope-from bde@zeta.org.au) Received: from bde.zeta.org.au (bde.zeta.org.au [203.2.228.102]) by mailman.zeta.org.au (8.9.3/8.8.7) with ESMTP id TAA19805; Sun, 15 Jul 2001 19:58:11 +1000 Date: Sun, 15 Jul 2001 19:55:57 +1000 (EST) From: Bruce Evans X-Sender: bde@besplex.bde.org To: Peter Wemm Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/config main.c In-Reply-To: <200107140003.f6E035X93360@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Fri, 13 Jul 2001, Peter Wemm wrote: > peter 2001/07/13 17:03:05 PDT > > Modified files: > usr.sbin/config main.c > Log: > Remove the old machine symlink first. This clobbers any user override of the link. config shouldn't change anything the sources haven't changed. > RCS file: /home/ncvs/src/sys/conf/Makefile.i386,v > Working file: Makefile.i386 > head: 1.239 > ---------------------------- > revision 1.28 > date: 1994/08/13 03:49:32; author: wollman; state: Exp; lines: +6 -2 > Change all #includes to follow the current Berkeley style. Some of these > ``changes'' are actually not changes at all, but CVS sometimes has trouble > telling the difference. > > This also includes support for second-directory compiles. This is not > quite complete yet, as `config' doesn't yet do the right thing. You can > still make it work trivially, however, by doing the following: > > rm /sys/compile > mkdir /usr/obj/sys/compile > ln -s M-. /sys/compile > cd /sys/i386/conf > config MYKERNEL > cd ../../compile/MYKERNEL > ln -s /sys @ > rm machine > ln -s @/i386/include machine > make depend > make > ---------------------------- I override the linke a lot, e.g.: lrwxr-xr-x 1 bde wheel 12 May 20 21:16 /c/obj/usr/src/sys/compile/GENERIC/@@ -> /usr/src/sys lrwxr-xr-x 1 bde wheel 14 May 20 21:16 /c/obj/usr/src/sys/compile/GENERIC/machine@ -> @/i386/include The "machine" symlink should always be to @/${MACHINE_ARCH}/include so that it doesn't need to be overridden. Then there would be a problem avoiding clobbering of overrides of "@". Bruce To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message