Module Name: src
Committed By: martin
Date: Tue Apr 23 10:38:49 UTC 2019
Modified Files:
src/etc/mtree [netbsd-8]: Makefile NetBSD.dist.base
Added Files:
src/etc/mtree [netbsd-8]: NetBSD.dist.iscsi
Log Message:
Pull up following revision(s) via patch (requested by mrg in ticket #1244):
etc/mtree/NetBSD.dist.base: revision 1.190
etc/mtree/NetBSD.dist.base: revision 1.191
etc/mtree/NetBSD.dist.base: revision 1.192
etc/mtree/NetBSD.dist.base: revision 1.193
etc/mtree/NetBSD.dist.iscsi: revision 1.1
etc/mtree/NetBSD.dist.base: revision 1.186
etc/mtree/NetBSD.dist.base: revision 1.187
etc/mtree/NetBSD.dist.base: revision 1.188
etc/mtree/NetBSD.dist.base: revision 1.189
etc/mtree/Makefile: revision 1.38
- add new entries of gcc=7 and libgomp, libasan, liblsan, libstdc++, libubsan
- add missing header files fpr gcc=7
- add some missing gcc=5 obsolete entries
- create ./usr/include/dev/bluetooth in mtree not make, and move it into the
base set where all other directories are.
create include/dev/dm here instead of elsewhere, where it may fail
add missing ./usr/include/dev/hdaudio (base).
(perhaps we should stop 'make includes' from creating the target directory
for normal builds as this leads to mtree inconsistencies.)
add missing ./usr/include/dev/hdmicec
add missing ./usr/include/dev/iscsi.
add two more missing subdirs:
./usr/include/dev/pud
./usr/include/dev/putter
add final missing directory from /usr/include:
./usr/include/netmpls
move ./usr/include/dev/iscsi into NetBSD.dist.iscsi that is only
included if MKISCSI != no.
To generate a diff of this commit:
cvs rdiff -u -r1.36.6.1 -r1.36.6.2 src/etc/mtree/Makefile
cvs rdiff -u -r1.160.2.3 -r1.160.2.4 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r0 -r1.1.2.2 src/etc/mtree/NetBSD.dist.iscsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.36.6.1 src/etc/mtree/Makefile:1.36.6.2
--- src/etc/mtree/Makefile:1.36.6.1 Wed Aug 30 15:45:04 2017
+++ src/etc/mtree/Makefile Tue Apr 23 10:38:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36.6.1 2017/08/30 15:45:04 martin Exp $
+# $NetBSD: Makefile,v 1.36.6.2 2019/04/23 10:38:49 martin Exp $
.include <bsd.own.mk>
@@ -40,6 +40,10 @@ EXTRA_DIST_FILES+= NetBSD.dist.dtrace
EXTRA_DIST_FILES+= NetBSD.dist.extsrc
.endif
+.if ${MKISCSI} != "no"
+EXTRA_DIST_FILES+= NetBSD.dist.iscsi
+.endif
+
NetBSD.dist: NetBSD.dist.tmp
cmp -s NetBSD.dist.tmp NetBSD.dist || { \
echo "Updating NetBSD.dist"; \
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.160.2.3 src/etc/mtree/NetBSD.dist.base:1.160.2.4
--- src/etc/mtree/NetBSD.dist.base:1.160.2.3 Wed Oct 31 08:55:32 2018
+++ src/etc/mtree/NetBSD.dist.base Tue Apr 23 10:38:49 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.160.2.3 2018/10/31 08:55:32 martin Exp $
+# $NetBSD: NetBSD.dist.base,v 1.160.2.4 2019/04/23 10:38:49 martin Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -112,10 +112,14 @@
./usr/include/dev
./usr/include/dev/apm
./usr/include/dev/ata
+./usr/include/dev/bluetooth
./usr/include/dev/dec
+./usr/include/dev/dm
./usr/include/dev/dmover
./usr/include/dev/dtv
./usr/include/dev/filemon
+./usr/include/dev/hdaudio
+./usr/include/dev/hdmicec
./usr/include/dev/hpc
./usr/include/dev/i2c
./usr/include/dev/i2o
@@ -127,6 +131,8 @@
./usr/include/dev/pci
./usr/include/dev/pckbc
./usr/include/dev/pcmcia
+./usr/include/dev/pud
+./usr/include/dev/putter
./usr/include/dev/raidframe
./usr/include/dev/sbus
./usr/include/dev/scsipi
@@ -208,15 +214,16 @@
./usr/include/msdosfs
./usr/include/net
./usr/include/net/agr
+./usr/include/net80211
./usr/include/netatalk
./usr/include/netbt
./usr/include/netcan
./usr/include/netinet
-./usr/include/net80211
./usr/include/netinet6
./usr/include/netipsec
./usr/include/netisdn
./usr/include/netkey
+./usr/include/netmpls
./usr/include/netnatm
./usr/include/netpgp
./usr/include/netsmb
Added files:
Index: src/etc/mtree/NetBSD.dist.iscsi
diff -u /dev/null src/etc/mtree/NetBSD.dist.iscsi:1.1.2.2
--- /dev/null Tue Apr 23 10:38:49 2019
+++ src/etc/mtree/NetBSD.dist.iscsi Tue Apr 23 10:38:49 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.iscsi,v 1.1.2.2 2019/04/23 10:38:49 martin Exp $
+
+./usr/include/dev/iscsi
