[src/trunk]: src/sys/dev Unconditionally install kernel headers for iSCSI as ...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/96c84e0be109
branches:  trunk
changeset: 954740:96c84e0be109
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Sep 10 01:53:22 2020 +0000

description:
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.

diffstat:

 distrib/sets/lists/base/mi |  4 ++--
 distrib/sets/lists/comp/mi |  6 +++---
 sys/dev/Makefile           |  8 ++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diffs (62 lines):

diff -r cb5b21a73d0f -r 96c84e0be109 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Wed Sep 09 20:04:10 2020 +0000
+++ b/distrib/sets/lists/base/mi        Thu Sep 10 01:53:22 2020 +0000
@@ -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
diff -r cb5b21a73d0f -r 96c84e0be109 distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Wed Sep 09 20:04:10 2020 +0000
+++ b/distrib/sets/lists/comp/mi        Thu Sep 10 01:53:22 2020 +0000
@@ -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
diff -r cb5b21a73d0f -r 96c84e0be109 sys/dev/Makefile
--- a/sys/dev/Makefile  Wed Sep 09 20:04:10 2020 +0000
+++ b/sys/dev/Makefile  Thu Sep 10 01:53:22 2020 +0000
@@ -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 @@
 
 .include <bsd.own.mk>
 
-.if ${MKISCSI} != "no"
-SUBDIR+= iscsi
-.endif
-
 INCSDIR= /usr/include/dev
 
 # Only install includes which are used by userland