From owner-freebsd-stable Fri Nov 1 10: 1: 5 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 02EC537B401 for ; Fri, 1 Nov 2002 10:01:04 -0800 (PST) Received: from shiva.jussieu.fr (shiva.jussieu.fr [134.157.0.129]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A0FE43E91 for ; Fri, 1 Nov 2002 10:00:57 -0800 (PST) (envelope-from arno@heho.snv.jussieu.fr) Received: from heho.snv.jussieu.fr (heho.snv.jussieu.fr [134.157.184.22]) by shiva.jussieu.fr (8.12.5/jtpda-5.4) with ESMTP id gA1HxejR006766 ; Fri, 1 Nov 2002 18:59:40 +0100 (CET) Received: from heho.snv.jussieu.fr (localhost [127.0.0.1]) by heho.snv.jussieu.fr (8.12.6/jtpda-5.2) with ESMTP id gA1Hxd9p029062 ; Fri, 1 Nov 2002 18:59:40 +0100 (MET) Received: (from arno@localhost) by heho.snv.jussieu.fr (8.12.6/8.12.6/Submit) id gA1HxdGk029054; Fri, 1 Nov 2002 18:59:39 +0100 (MET) To: thomas@cuivre.fr.eu.org Cc: freebsd-stable@freebsd.org Subject: Re: SCSI emulation help and patching References: <200210292136.40600.joe@dubium.com> <20021031005845.60B46114@CRWdog.demon.co.uk> <20021031232242.GB13969@melusine.cuivre.fr.eu.org> From: arno@heho.snv.jussieu.fr Date: 01 Nov 2002 18:59:38 +0100 In-Reply-To: <20021031232242.GB13969@melusine.cuivre.fr.eu.org> Message-ID: Lines: 43 User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Antivirus: scanned by sophie at shiva.jussieu.fr Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Thomas, > Le 2002-10-31, Andy Sparrow =E9crivait : >=20 > > Yup, that's probably it. I just (re)patched my src tree after a fresh=20 > > cvsup, and this file fails to patch with atapicam-STABLE-config-2002082= 0. > > diff. Here's sys/conf/files.rej: >=20 > A patch is not needed anymore: I have MFCd ATAPI/CAM on the RELENG_4 > branch a few minutes ago. thanx very much! NB, I had to apply the following patch in order to compile a kernel *without* ATAPICAM; I'm not 100% sure it's the correct patch. Have a nice weekend, Arno Index: sys/dev/ata/ata-all.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/ncvs/src/sys/dev/ata/ata-all.c,v retrieving revision 1.50.2.41 diff -u -r1.50.2.41 ata-all.c --- sys/dev/ata/ata-all.c 31 Oct 2002 23:10:33 -0000 1.50.2.41 +++ sys/dev/ata/ata-all.c 1 Nov 2002 17:50:12 -0000 @@ -595,7 +595,9 @@ #if NATAPICAM > 0 atapi_cam_attach_bus(ch); #endif +#if DEV_ATAPIALL } +#endif splx(s); } --=20 Arno J. Klaassen INSERM U483 UPMC, 9 quai St Bernard 75005 Paris, France To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message