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

separate out the arch-specific and compat-specific subdirs. 

put compat stuff in NetBSD.compat.$MACHINE_ARCH, and normal
stuff in NetBSD.dist.$MACHINE/MACHINE_ARCH, etc.

probably need at at more files for sh3, mips, ppc, sparc,
m68k, arm, ia64, etc., as every port has port- or arch-
specific header subdirectory.
This commit is contained in:
mrg 2019-02-09 21:43:23 +00:00
parent 53ba185d70
commit 1892f84f2f
14 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/mtree/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.38 2019/02/09 02:04:19 mrg Exp $
# $NetBSD: Makefile,v 1.39 2019/02/09 21:43:23 mrg Exp $
.include <bsd.own.mk>
@ -10,10 +10,8 @@ EXTRA_DIST_FILES= NetBSD.dist.Xorg
# by something else; this may need to be fixed properly in the future.
.if defined(MKCOMPAT) && ${MKCOMPAT} != "no"
.include "${NETBSDSRCDIR}/compat/archdirs.mk"
.if exists(NetBSD.dist.${MACHINE_ARCH})
EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE_ARCH}
.elif !empty(MACHINE_ARCH:Mearm*)
EXTRA_DIST_FILES+= NetBSD.dist.earm
.if exists(NetBSD.compat.${MACHINE_ARCH})
EXTRA_DIST_FILES+= NetBSD.compat.${MACHINE_ARCH}
.endif
EXTRA_DIST_FILES+= NetBSD.dist.compat # autogenerated
.if defined(MKCOMPATX11) && ${MKCOMPATX11} != "no" && ${MKX11} != "no"
@ -21,6 +19,10 @@ EXTRA_DIST_FILES+= NetBSD.dist.xcompat # autogenerated
.endif
.endif
.if exists(NetBSD.dist.${MACHINE_ARCH})
EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE_ARCH}
.endif
.if exists(NetBSD.dist.${MACHINE})
EXTRA_DIST_FILES+= NetBSD.dist.${MACHINE}
.endif

4
etc/mtree/NetBSD.compat.aarch64 Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: NetBSD.compat.aarch64,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/arm
./usr/include/g++/bits/aarch64

2
etc/mtree/NetBSD.dist.mips64el → etc/mtree/NetBSD.compat.mips64eb
View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist.mips64el,v 1.10 2015/06/19 18:16:06 matt Exp $
# $NetBSD: NetBSD.compat.mips64eb,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/mips64
./usr/include/g++/bits/mips32

2
etc/mtree/NetBSD.dist.mips64eb → etc/mtree/NetBSD.compat.mips64el
View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist.mips64eb,v 1.9 2015/06/19 18:16:06 matt Exp $
# $NetBSD: NetBSD.compat.mips64el,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/mips64
./usr/include/g++/bits/mips32

4
etc/mtree/NetBSD.compat.powerpc64 Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: NetBSD.compat.powerpc64,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/powerpc
./usr/include/g++/bits/powerpc64

4
etc/mtree/NetBSD.compat.riscv64 Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: NetBSD.compat.riscv64,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/riscv32
./usr/include/g++/bits/riscv64

2
etc/mtree/NetBSD.dist.sparc64 → etc/mtree/NetBSD.compat.sparc64
View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist.sparc64,v 1.10 2015/06/19 18:16:06 matt Exp $
# $NetBSD: NetBSD.compat.sparc64,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/sparc
./usr/include/g++/bits/sparc64

4
etc/mtree/NetBSD.compat.x86_64 Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: NetBSD.compat.x86_64,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/g++/bits/i386
./usr/include/g++/bits/x86_64

4
etc/mtree/NetBSD.dist.aarch64
View File

@ -1,4 +0,0 @@
# $NetBSD: NetBSD.dist.aarch64,v 1.4 2018/07/17 00:50:56 christos Exp $
./usr/include/g++/bits/arm
./usr/include/g++/bits/aarch64

2
etc/mtree/NetBSD.dist.earm
View File

@ -1,2 +0,0 @@
# $NetBSD: NetBSD.dist.earm,v 1.3 2015/06/19 18:16:06 matt Exp $

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

@ -0,0 +1,3 @@
# $NetBSD: NetBSD.dist.m68k,v 1.1 2019/02/09 21:43:23 mrg Exp $
./usr/include/m68k

4
etc/mtree/NetBSD.dist.powerpc64
View File

@ -1,4 +0,0 @@
# $NetBSD: NetBSD.dist.powerpc64,v 1.3 2015/06/19 18:16:06 matt Exp $
./usr/include/g++/bits/powerpc
./usr/include/g++/bits/powerpc64

4
etc/mtree/NetBSD.dist.riscv64
View File

@ -1,4 +0,0 @@
# $NetBSD: NetBSD.dist.riscv64,v 1.2 2015/06/19 18:16:06 matt Exp $
./usr/include/g++/bits/riscv32
./usr/include/g++/bits/riscv64

4
etc/mtree/NetBSD.dist.x86_64
View File

@ -1,10 +1,8 @@
# $NetBSD: NetBSD.dist.x86_64,v 1.12 2019/02/08 23:27:14 mrg Exp $
# $NetBSD: NetBSD.dist.x86_64,v 1.13 2019/02/09 21:43:23 mrg Exp $
./usr/include/amd64
./usr/include/dev/nvmm
./usr/include/dev/nvmm/x86
./usr/include/g++/bits/i386
./usr/include/g++/bits/x86_64
./usr/include/i386
./usr/include/x86
./usr/include/xen