On 06/ 9/16 08:35 PM, Conrad Meyer wrote: > i386 as well (although we are replying to the wrong commit, I think > r301771 is what broke it): > > In file included from /usr/src/sbin/camcontrol/camcontrol.c:56: > /usr/obj/usr/src/tmp/usr/include/cam/cam_ccb.h:44:10: fatal error: > 'cam/nvme/nvme_all.h' file not found > #include <cam/nvme/nvme_all.h>
The attached patch fixed the build problem for me. FYI... Jung-uk Kim > Best, > Conrad > > On Thu, Jun 9, 2016 at 5:00 PM, Glen Barber <[email protected]> wrote: >> On Thu, Jun 09, 2016 at 04:05:56PM +0000, Warner Losh wrote: >>> Author: imp >>> Date: Thu Jun 9 16:05:56 2016 >>> New Revision: 301741 >>> URL: https://svnweb.freebsd.org/changeset/base/301741 >>> >>> Log: >>> Add place holder for SDIO CAM stuff for CCB XPT type. >>> >> >> One of these commits breaks sparc64. >> >> In file included from /usr/src/sbin/camcontrol/camcontrol.c:56: >> /usr/obj/sparc64.sparc64/usr/src/tmp/usr/include/cam/cam_ccb.h:44:31: >> error: cam/nvme/nvme_all.h: No such file or directory >> In file included from /usr/src/sbin/camcontrol/camcontrol.c:56: >> /usr/obj/sparc64.sparc64/usr/src/tmp/usr/include/cam/cam_ccb.h:794: >> error: field 'cmd' has incomplete type >> /usr/obj/sparc64.sparc64/usr/src/tmp/usr/include/cam/cam_ccb.h:795: >> error: field 'cpl' has incomplete type >> >> Glen
Index: etc/mtree/BSD.include.dist
===================================================================
--- etc/mtree/BSD.include.dist (revision 301775)
+++ etc/mtree/BSD.include.dist (working copy)
@@ -90,6 +90,8 @@
cam
ata
..
+ nvme
+ ..
scsi
..
..
Index: include/Makefile
===================================================================
--- include/Makefile (revision 301775)
+++ include/Makefile (working copy)
@@ -42,7 +42,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h s
LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \
netipsec netnatm netsmb nfs nfsclient nfsserver sys vm
-LSUBDIRS= cam/ata cam/scsi \
+LSUBDIRS= cam/ata cam/nvme cam/scsi \
dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \
dev/hwpmc \
dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/nvme \
signature.asc
Description: OpenPGP digital signature
