Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
martin 2019-04-23 10:38:49 +00:00
parent 2fa9a1bd8b
commit 7dd73c2e59
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/mtree/Makefile
View File

@ -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"; \

11
etc/mtree/NetBSD.dist.base
View File

@ -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

3
etc/mtree/NetBSD.dist.iscsi Normal file
View File

@ -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