buildkernel upgrade path from 6.1-RELEASE broken?

[David Wolfskill]

On Mon, Jun 12, 2006 at 07:24:40PM +0200, Dag-Erling Smørgrav 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
===================================================================
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 @@
 
 #include <machine/resource.h>
 #include <sys/rman.h>
+#include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
 

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 at localhost:/common/S4/obj/usr/src/sys/LAPTOP_30W  i386
localhost(7.0-C)[2] 

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
Doing business with spammers only encourages them.  Please boycott spammers.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 195 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20060612/cd9cc882/attachment.pgp