Date: Fri, 10 Jun 2016 00:39:56 -0400 From: Jung-uk Kim <jkim@FreeBSD.org> To: cem@freebsd.org, Glen Barber <gjb@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r301741 - head/sys/cam Message-ID: <09e5d94f-e3ec-723b-cb5a-0d582bf1d804@FreeBSD.org> In-Reply-To: <CAG6CVpWO=iD02OonL7ibYMg6zrSCMdBHsp3_WwrZnDH=6nTDWg@mail.gmail.com> References: <201606091605.u59G5u1O037551@repo.freebsd.org> <20160610000055.GT2323@FreeBSD.org> <CAG6CVpWO=iD02OonL7ibYMg6zrSCMdBHsp3_WwrZnDH=6nTDWg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7OxVlDKhwvcFtQvMwowGgT09nX90nQ9mq Content-Type: multipart/mixed; boundary="pchDtS7Hw5FkwG4dSOVNCxeG5cufVVxqw" From: Jung-uk Kim <jkim@FreeBSD.org> To: cem@freebsd.org, Glen Barber <gjb@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <09e5d94f-e3ec-723b-cb5a-0d582bf1d804@FreeBSD.org> Subject: Re: svn commit: r301741 - head/sys/cam References: <201606091605.u59G5u1O037551@repo.freebsd.org> <20160610000055.GT2323@FreeBSD.org> <CAG6CVpWO=iD02OonL7ibYMg6zrSCMdBHsp3_WwrZnDH=6nTDWg@mail.gmail.com> In-Reply-To: <CAG6CVpWO=iD02OonL7ibYMg6zrSCMdBHsp3_WwrZnDH=6nTDWg@mail.gmail.com> --pchDtS7Hw5FkwG4dSOVNCxeG5cufVVxqw Content-Type: multipart/mixed; boundary="------------4776D4012D68AC65D9B3F71F" This is a multi-part message in MIME format. --------------4776D4012D68AC65D9B3F71F Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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): >=20 > 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 >=20 > On Thu, Jun 9, 2016 at 5:00 PM, Glen Barber <gjb@freebsd.org> 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 --------------4776D4012D68AC65D9B3F71F Content-Type: text/x-patch; name="nvme.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="nvme.diff" Index: etc/mtree/BSD.include.dist =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 --- 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 =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 --- include/Makefile (revision 301775) +++ include/Makefile (working copy) @@ -42,7 +42,7 @@ LHDRS=3D aio.h errno.h fcntl.h linker_set.h poll.h s LDIRS=3D bsm cam geom net net80211 netgraph netinet netinet6 \ netipsec netnatm netsmb nfs nfsclient nfsserver sys vm =20 -LSUBDIRS=3D cam/ata cam/scsi \ +LSUBDIRS=3D 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 \ --------------4776D4012D68AC65D9B3F71F-- --pchDtS7Hw5FkwG4dSOVNCxeG5cufVVxqw-- --7OxVlDKhwvcFtQvMwowGgT09nX90nQ9mq Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJXWkScAAoJEHyflib82/FGAncH/3u1i2FGutI1fbQY9Fs/3LF4 bblzhYuQIpY1vJ99Hp4ld8kqcqWuRUdwhriSYR1rrXBPtC5WXlKJ7E9BHB7A6HCV IAAJQ1fSNhEeetH5+OocYrbLecQerSGKVh395QHiguSksioyZ8WSiZC8mYdZsxIe v3hanoTscOFov8JUjW1e93rG5T6kIJ5teeRIHFZgq0Lk+FAgGNfPt1qwBcycVgGw hZ2KnRZGH3An0fou2TpY78s3FZ2CKN9LSPADJhyD2MYdd4hS/QX7QXAg7+5rTKp2 etJaBGsY/gc0Y37pHbIpKtLBXBjWoMhLc+Ap04YbxZVwhZWnLiYlnuw4IjzjHmI= =8Pkb -----END PGP SIGNATURE----- --7OxVlDKhwvcFtQvMwowGgT09nX90nQ9mq--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?09e5d94f-e3ec-723b-cb5a-0d582bf1d804>