Module Name: src
Committed By: rin
Date: Thu Sep 10 01:53:22 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/sys/dev: Makefile
Log Message:
Unconditionally install kernel headers for iSCSI as required by
sanitizer shipped with GCC9.
Fix build release with HAVE_GCC=9 for sun2, where MKISCSI=no by default.
To generate a diff of this commit:
cvs rdiff -u -r1.1261 -r1.1262 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2349 -r1.2350 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.44 -r1.45 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.1261 src/distrib/sets/lists/base/mi:1.1262
--- src/distrib/sets/lists/base/mi:1.1261 Wed Sep 9 06:50:33 2020
+++ src/distrib/sets/lists/base/mi Thu Sep 10 01:53:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1261 2020/09/09 06:50:33 mrg Exp $
+# $NetBSD: mi,v 1.1262 2020/09/10 01:53:22 rin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1149,7 +1149,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 iscsi
+./usr/include/dev/iscsi base-c-usr
./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.2349 src/distrib/sets/lists/comp/mi:1.2350
--- src/distrib/sets/lists/comp/mi:1.2349 Wed Sep 9 14:38:41 2020
+++ src/distrib/sets/lists/comp/mi Thu Sep 10 01:53:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2349 2020/09/09 14:38:41 kamil Exp $
+# $NetBSD: mi,v 1.2350 2020/09/10 01:53:22 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 iscsi
-./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi.h comp-c-include
+./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include
./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.44 src/sys/dev/Makefile:1.45
--- src/sys/dev/Makefile:1.44 Sun Jan 19 20:41:18 2020
+++ src/sys/dev/Makefile Thu Sep 10 01:53:22 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2020/01/19 20:41:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.45 2020/09/10 01:53:22 rin Exp $
SUBDIR= apm ata bluetooth dec dm dmover dtv hdaudio hdmicec hid hpc \
- i2c i2o ic ieee1394 ir isa \
+ i2c i2o ic ieee1394 ir isa iscsi \
microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
spi sun tc usb vme wscons
@@ -11,10 +11,6 @@ SUBDIR+= nvmm
.include <bsd.own.mk>
-.if ${MKISCSI} != "no"
-SUBDIR+= iscsi
-.endif
-
INCSDIR= /usr/include/dev
# Only install includes which are used by userland
