buildworld RELENG_6 + New USB stack - Stop in /usr/src/usr.bin/kdump

[Hans Petter Selasky]

On Wednesday 27 June 2007 17:55, Eygene Ryabinkin wrote:
> Andrew, *, good day.
>
> Wed, Jun 27, 2007 at 06:18:04PM +0400, Andrew Muhametshin wrote:
> > Hello
> >
> > It is impossible to buildworld with a new USB stack.
>
> +1 from me: does not work on 7-CURRENT too.  The same diagnostics.
>
> > make buildworld
> > <...>skip<...>
> > ===> usr.bin/kdump (all)
> > cc -O2 -fno-strict-aliasing -pipe -march=athlon-tbird
> > -I/usr/src/usr.bin/kdump/../ktrace -I/usr/src/usr.bin/kdump/../..  -c
> > /usr/src/usr.bin/kdump/kdump.c
> > cc -O2 -fno-strict-aliasing -pipe -march=athlon-tbird
> > -I/usr/src/usr.bin/kdump/../ktrace -I/usr/src/usr.bin/kdump/../..  -c
> > ioctl.c ioctl.c: In function `ioctlname':
> > ioctl.c:973: error: syntax error before ';' token
> > ioctl.c:1191: error: syntax error before ';' token
> > ioctl.c:1517: error: syntax error before ';' token
> > ioctl.c:1653: error: syntax error before ';' token
> > ioctl.c:2193: error: syntax error before ';' token
> > ioctl.c:2869: error: syntax error before ';' token
> > *** Error code 1
> >
> > Stop in /usr/src/usr.bin/kdump.
> > *** Error code 1

I've committed the following to my SVN repo:

Index: usb.h
===================================================================
--- usb.h       (revision 519)
+++ usb.h       (working copy)
@@ -815,12 +815,12 @@
 #define USB_DEVICESTATS                _IOR ('U', 5, struct usb_device_stats)
 #define USB_DEVICEENUMERATE    _IOW ('U', 6, struct usb_device_enumerate)
 
-#define        USB_DEVICE_VEP_SETUP    _IOW ('U',10, struct 
usb_device_vep_setup);
-#define        USB_DEVICE_VEP_UNSETUP  _IOW ('U',11, struct 
usb_device_vep_unsetup);
-#define        USB_DEVICE_PUT_URB      _IOW ('U',12, struct 
usb_device_put_urb);
-#define        USB_DEVICE_GET_URB      _IOW ('U',13, struct 
usb_device_get_urb);
-#define        USB_DEVICE_CANCEL_URB   _IOW ('U',14, struct 
usb_device_cancel_urb);
-#define        USB_DEVICE_POLL_URB     _IOR ('U',15, struct 
usb_device_poll_urb);
+#define        USB_DEVICE_VEP_SETUP    _IOW ('U',10, struct 
usb_device_vep_setup)
+#define        USB_DEVICE_VEP_UNSETUP  _IOW ('U',11, struct 
usb_device_vep_unsetup)
+#define        USB_DEVICE_PUT_URB      _IOW ('U',12, struct 
usb_device_put_urb)
+#define        USB_DEVICE_GET_URB      _IOW ('U',13, struct 
usb_device_get_urb)
+#define        USB_DEVICE_CANCEL_URB   _IOW ('U',14, struct 
usb_device_cancel_urb)
+#define        USB_DEVICE_POLL_URB     _IOR ('U',15, struct 
usb_device_poll_urb)
 
 /* Generic HID device */
 #define USB_GET_REPORT_DESC    _IOR ('U', 21, struct usb_ctl_report_desc)

Seems like a ";" sneaked in after some not yet in use ioctl definitions.

Try a "svn update" and copy in the "usb.h" file from the repo 
to "/usr/src/sys/dev/usb/usb.h" .

Thanks for reporting.

--HPS