The branch main has been updated by manu:
URL:
https://cgit.FreeBSD.org/src/commit/?id=0594b28795883579e5300ffc3e57a1504cc43117
commit 0594b28795883579e5300ffc3e57a1504cc43117
Author: Emmanuel Vadot <m...@freebsd.org>
AuthorDate: 2021-03-16 06:12:49 +0000
Commit: Emmanuel Vadot <m...@freebsd.org>
CommitDate: 2021-03-16 06:12:49 +0000
pkgbase: Install all cam includes with INCS
Now they are correctly taggued and put into the -dev package
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D29166
MFC after: 2 weeks
---
include/Makefile | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 54 insertions(+), 3 deletions(-)
diff --git a/include/Makefile b/include/Makefile
index cf760359d2f5..d47879e11c93 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -38,11 +38,10 @@ PHDRS= sched.h _semaphore.h
LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \
syslog.h ucontext.h
-LDIRS= cam geom net net80211 netgraph netinet netinet6 \
+LDIRS= geom net net80211 netgraph netinet netinet6 \
netipsec netsmb nfs nfsclient nfsserver sys vm
-LSUBDIRS= cam/ata cam/mmc cam/nvme cam/scsi \
- dev/acpica dev/agp dev/an dev/ciss dev/filemon dev/firewire \
+LSUBDIRS= dev/acpica dev/agp dev/an dev/ciss dev/filemon dev/firewire \
dev/hwpmc dev/hyperv \
dev/ic dev/iicbus dev/if_wg dev/io dev/mfi dev/mmc dev/nvme \
dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \
@@ -94,6 +93,53 @@ SECAUDIT= audit.h \
SECAUDITPACKAGE= libbsm
SECAUDITDIR= ${INCLUDEDIR}/security/audit
+.PATH: ${SRCTOP}/sys/cam
+CAM= cam.h \
+ cam_ccb.h \
+ cam_compat.h \
+ cam_debug.h \
+ cam_iosched.h \
+ cam_periph.h \
+ cam_queue.h \
+ cam_sim.h \
+ cam_xpt.h \
+ cam_xpt_internal.h \
+ cam_xpt_periph.h \
+ cam_xpt_sim.h
+CAMDIR= ${INCLUDEDIR}/cam
+
+.PATH: ${SRCTOP}/sys/cam/ata
+CAMATA= ata_all.h
+CAMATADIR= ${INCLUDEDIR}/cam/ata
+
+.PATH: ${SRCTOP}/sys/cam/mmc
+CAMMMC= mmc.h \
+ mmc_bus.h \
+ mmc_all.h
+CAMMMCDIR= ${INCLUDEDIR}/cam/mmc
+
+.PATH: ${SRCTOP}/sys/cam/nvme
+CAMNVME= nvme_all.h
+CAMNVMEDIR= ${INCLUDEDIR}/cam/nvme
+
+.PATH: ${SRCTOP}/sys/cam/scsi
+CAMSCSI= scsi_all.h \
+ scsi_cd.h \
+ scsi_ch.h \
+ scsi_da.h \
+ scsi_enc.h \
+ scsi_enc_internal.h \
+ scsi_iu.h \
+ scsi_message.h \
+ scsi_pass.h \
+ scsi_pt.h \
+ scsi_sa.h \
+ scsi_ses.h \
+ scsi_sg.h \
+ scsi_targetio.h \
+ smp_all.h
+CAMSCSIDIR= ${INCLUDEDIR}/cam/scsi
+
.PATH: ${SRCTOP}/sys/fs/cd9660
FS9660= cd9660_mount.h \
cd9660_node.h \
@@ -181,6 +227,11 @@ WGDIR= ${INCLUDEDIR}/dev/if_wg
INCSGROUPS= INCS \
ACPICA \
AGP \
+ CAM \
+ CAMATA \
+ CAMMMC \
+ CAMNVME \
+ CAMSCSI \
CRYPTO \
EVDEV \
FS9660 \
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
