Date: Mon, 12 Jun 2006 11:20:20 -0700 From: David Wolfskill <david@catwhisker.org> To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= <des@des.no> Cc: Robert Watson <rwatson@freebsd.org>, current@freebsd.org Subject: Re: buildkernel upgrade path from 6.1-RELEASE broken? Message-ID: <20060612182020.GN32476@bunrab.catwhisker.org> In-Reply-To: <86u06q1e3r.fsf@xps.des.no> References: <20060612152246.U24745@fledge.watson.org> <86u06q1e3r.fsf@xps.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <machine/resource.h> #include <sys/rman.h> +#include <machine/bus.h> =20 #include <dev/pci/pcivar.h> =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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060612182020.GN32476>