From owner-freebsd-questions Wed Oct 30 16:59: 3 2002 Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB4FA37B401; Wed, 30 Oct 2002 16:59:00 -0800 (PST) Received: from CRWdog.demon.co.uk (adsl-66-123-232-98.dsl.sndg02.pacbell.net [66.123.232.98]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DC5443E75; Wed, 30 Oct 2002 16:58:58 -0800 (PST) (envelope-from spadger@best.com) Received: from localhost (localhost [127.0.0.1]) by CRWdog.demon.co.uk (Postfix) with ESMTP id 60B46114; Wed, 30 Oct 2002 16:58:45 -0800 (PST) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: joe Cc: Michael Joyner , TooMany Mirrors , freebsd-questions@FreeBSD.ORG, freebsd-stable@FreeBSD.ORG Subject: Re: SCSI emulation help and patching In-Reply-To: Message from joe of "Tue, 29 Oct 2002 21:36:40 PST." <200210292136.40600.joe@dubium.com> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_-38337991P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Wed, 30 Oct 2002 16:58:45 -0800 From: Andy Sparrow Message-Id: <20021031005845.60B46114@CRWdog.demon.co.uk> Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --==_Exmh_-38337991P Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable > Check that the file /usr/src/sys/conf/files has been patched. It shoul= d = > contain the lines > < dev/ata/atapi-all.c optional atapicam > < dev/ata/atapi-cam.c optional atapicam Yup, that's probably it. I just (re)patched my src tree after a fresh = cvsup, and this file fails to patch with atapicam-STABLE-config-20020820.= diff. Here's sys/conf/files.rej: *** 137,145 **** dev/ata/atapi-all.c optional atapicd dev/ata/atapi-all.c optional atapifd dev/ata/atapi-all.c optional atapist dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist #dev/amr/amr_cam.c optional amr dev/amr/amr_disk.c optional amr dev/amr/amr_pci.c optional amr --- 137,147 ---- dev/ata/atapi-all.c optional atapicd dev/ata/atapi-all.c optional atapifd dev/ata/atapi-all.c optional atapist + dev/ata/atapi-all.c optional atapicam dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist + dev/ata/atapi-cam.c optional atapicam #dev/amr/amr_cam.c optional amr dev/amr/amr_disk.c optional amr dev/amr/amr_pci.c optional amr Cheers, AS --==_Exmh_-38337991P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (FreeBSD) Comment: Exmh version 2.5 07/13/2001 iD8DBQE9wIBFPHh895bDXeQRAnhPAJ9mM6RzBGRvEArA+gsrLA1Si4bBSQCgkvkA kmZMhuksSaE1jgA3Dvgw1qg= =zOOe -----END PGP SIGNATURE----- --==_Exmh_-38337991P-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message