Module Name: src
Committed By: rin
Date: Mon Sep 14 00:40:03 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/sys/dev: Makefile
Log Message:
Revert previous to make iscsi kernel headers optional again, as
required by kamil.
Now, sanitizer in GCC9 has been fixed differently for MKISCSI=no.
To generate a diff of this commit:
cvs rdiff -u -r1.1263 -r1.1264 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2353 -r1.2354 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1263 src/distrib/sets/lists/base/mi:1.1264
--- src/distrib/sets/lists/base/mi:1.1263 Sat Sep 12 15:25:41 2020
+++ src/distrib/sets/lists/base/mi Mon Sep 14 00:40:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1263 2020/09/12 15:25:41 jmcneill Exp $
+# $NetBSD: mi,v 1.1264 2020/09/14 00:40:03 rin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1150,7 +1150,7 @@
./usr/include/dev/ir base-c-usr
./usr/include/dev/isa base-c-usr
./usr/include/dev/isapnp base-obsolete obsolete
-./usr/include/dev/iscsi base-c-usr
+./usr/include/dev/iscsi base-c-usr iscsi
./usr/include/dev/microcode base-obsolete obsolete
./usr/include/dev/microcode/aic7xxx base-obsolete obsolete
./usr/include/dev/microcode/isp base-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2353 src/distrib/sets/lists/comp/mi:1.2354
--- src/distrib/sets/lists/comp/mi:1.2353 Sun Sep 13 03:43:16 2020
+++ src/distrib/sets/lists/comp/mi Mon Sep 14 00:40:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2353 2020/09/13 03:43:16 kamil Exp $
+# $NetBSD: mi,v 1.2354 2020/09/14 00:40:02 rin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -619,8 +619,8 @@
./usr/include/dev/isapnp/if_levar.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpreg.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpvar.h comp-obsolete obsolete
-./usr/include/dev/iscsi/iscsi.h comp-c-include
-./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include
+./usr/include/dev/iscsi/iscsi.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
./usr/include/dev/iscsi/iscsi_perf.h comp-obsolete obsolete
./usr/include/dev/iscsi/iscsi_test.h comp-obsolete obsolete
./usr/include/dev/keylock.h comp-c-include
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.45 src/sys/dev/Makefile:1.46
--- src/sys/dev/Makefile:1.45 Thu Sep 10 01:53:22 2020
+++ src/sys/dev/Makefile Mon Sep 14 00:40:03 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2020/09/10 01:53:22 rin Exp $
+# $NetBSD: Makefile,v 1.46 2020/09/14 00:40:03 rin Exp $
SUBDIR= apm ata bluetooth dec dm dmover dtv hdaudio hdmicec hid hpc \
- i2c i2o ic ieee1394 ir isa iscsi \
+ i2c i2o ic ieee1394 ir isa \
microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
spi sun tc usb vme wscons
@@ -11,6 +11,10 @@ SUBDIR+= nvmm
.include <bsd.own.mk>
+.if ${MKISCSI} != "no"
+SUBDIR+= iscsi
+.endif
+
INCSDIR= /usr/include/dev
# Only install includes which are used by userland
