From owner-freebsd-current@FreeBSD.ORG Mon Jun 12 18:20:38 2006 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E2B6F16A41F; Mon, 12 Jun 2006 18:20:38 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from bunrab.catwhisker.org (adsl-63-193-123-122.dsl.snfc21.pacbell.net [63.193.123.122]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43DC443D82; Mon, 12 Jun 2006 18:20:23 +0000 (GMT) (envelope-from david@catwhisker.org) Received: from bunrab.catwhisker.org (localhost [127.0.0.1]) by bunrab.catwhisker.org (8.13.3/8.13.3) with ESMTP id k5CIKKx3014088; Mon, 12 Jun 2006 11:20:20 -0700 (PDT) (envelope-from david@bunrab.catwhisker.org) Received: (from david@localhost) by bunrab.catwhisker.org (8.13.3/8.13.1/Submit) id k5CIKKVG014087; Mon, 12 Jun 2006 11:20:20 -0700 (PDT) (envelope-from david) Date: Mon, 12 Jun 2006 11:20:20 -0700 From: David Wolfskill To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Message-ID: <20060612182020.GN32476@bunrab.catwhisker.org> Mail-Followup-To: David Wolfskill , Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , Robert Watson , current@freebsd.org References: <20060612152246.U24745@fledge.watson.org> <86u06q1e3r.fsf@xps.des.no> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="WvWoJFHT91CrHm5Q" Content-Disposition: inline In-Reply-To: <86u06q1e3r.fsf@xps.des.no> User-Agent: Mutt/1.4.2.1i Cc: Robert Watson , current@freebsd.org Subject: Re: buildkernel upgrade path from 6.1-RELEASE broken? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jun 2006 18:20:39 -0000 --WvWoJFHT91CrHm5Q Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 12, 2006 at 07:24:40PM +0200, Dag-Erling Sm=F8rgrav wrote: > ... > Warner and Nate just fixed these, but there's additional breakage in > puc which seems related to the atkbdc issue. Confirmed. I hand-applied the diffs for the first two, and then edited sys/dev/puc/pucdata.c thus: Index: sys/dev/puc/pucdata.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: /cvs/freebsd/src/sys/dev/puc/pucdata.c,v retrieving revision 1.55 diff -u -r1.55 pucdata.c --- sys/dev/puc/pucdata.c 28 Apr 2006 21:21:52 -0000 1.55 +++ sys/dev/puc/pucdata.c 12 Jun 2006 17:54:03 -0000 @@ -39,6 +39,7 @@ =20 #include #include +#include =20 #include =20 And the resulting system finally built & boots: localhost(7.0-C)[1] uname -a FreeBSD localhost 7.0-CURRENT FreeBSD 7.0-CURRENT #107: Mon Jun 12 10:37:14= PDT 2006 root@localhost:/common/S4/obj/usr/src/sys/LAPTOP_30W i386 localhost(7.0-C)[2]=20 Peace, david --=20 David H. Wolfskill david@catwhisker.org Doing business with spammers only encourages them. Please boycott spammers. See http://www.catwhisker.org/~david/publickey.gpg for my public key. --WvWoJFHT91CrHm5Q Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (FreeBSD) iEYEARECAAYFAkSNsGMACgkQmprOCmdXAD1P5gCfXrBPEtnLXkSBgMs3HQBUkBgk a1QAn0hD/w6v6tG0tS0PdDSD9VI4NbWT =LIRM -----END PGP SIGNATURE----- --WvWoJFHT91CrHm5Q--