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

remove the recently added files or added entries for what is 

./usr/include/$MACHINE and automatically add it.

add sun68k for sun2/sun3.  tested on about 12 platforms.

there may be more failures to figure out but this should make
them all special cases rather than always expected cases.

fortunately, most builds don't see to hit these issues for
reasons i haven't determined yet.
This commit is contained in:
mrg 2019-03-12 10:07:49 +00:00
parent b6791591f6
commit ab6c389b06
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/mtree/Makefile
View File

@ -1,9 +1,11 @@
# $NetBSD: Makefile,v 1.40 2019/02/17 05:29:08 mrg Exp $ # $NetBSD: Makefile,v 1.41 2019/03/12 10:07:49 mrg Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
EXTRA_DIST_FILES= NetBSD.dist.machine # autogenerated
.if ${MKX11} != "no" .if ${MKX11} != "no"
EXTRA_DIST_FILES= NetBSD.dist.Xorg EXTRA_DIST_FILES+= NetBSD.dist.Xorg
.endif .endif
# Derived from MACHINE_CPU, but keeping 32/64bit for most. # Derived from MACHINE_CPU, but keeping 32/64bit for most.
@ -77,6 +79,10 @@ NetBSD.dist: NetBSD.dist.tmp
NetBSD.dist.tmp: NetBSD.dist.base ${EXTRA_DIST_FILES} NetBSD.dist.tmp: NetBSD.dist.base ${EXTRA_DIST_FILES}
${TOOL_CAT} ${.ALLSRC} > ${.TARGET} ${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
NetBSD.dist.machine:
${MKCREATE}
echo ./usr/include/${MACHINE} > ${.TARGET}
NetBSD.dist.compat: NetBSD.dist.compat.in mkcompat.awk NetBSD.dist.compat: NetBSD.dist.compat.in mkcompat.awk
${MKCREATE} ${MKCREATE}
${TOOL_AWK} -f ${.ALLSRC:M*.awk} -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \ ${TOOL_AWK} -f ${.ALLSRC:M*.awk} -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \
@ -130,6 +136,7 @@ distrib-dirs: .PHONY check_DESTDIR NetBSD.dist
.endif # DISTRIBUTION_DONE # } .endif # DISTRIBUTION_DONE # }
CLEANFILES+= NetBSD.dist NetBSD.dist.tmp CLEANFILES+= NetBSD.dist NetBSD.dist.tmp
CLEANFILES+= NetBSD.dist.machine
CLEANFILES+= NetBSD.dist.compat CLEANFILES+= NetBSD.dist.compat
CLEANFILES+= NetBSD.dist.tests.compat CLEANFILES+= NetBSD.dist.tests.compat

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

@ -1,3 +0,0 @@
# $NetBSD: NetBSD.dist.aarch64,v 1.6 2019/02/17 05:29:08 mrg Exp $
./usr/include/aarch64

3
etc/mtree/NetBSD.dist.i386
View File

@ -1,5 +1,4 @@
# $NetBSD: NetBSD.dist.i386,v 1.1 2019/02/09 00:15:28 mrg Exp $ # $NetBSD: NetBSD.dist.i386,v 1.2 2019/03/12 10:07:49 mrg Exp $
./usr/include/i386
./usr/include/x86 ./usr/include/x86
./usr/include/xen ./usr/include/xen

3
etc/mtree/NetBSD.dist.ia64
View File

@ -1,3 +0,0 @@
# $NetBSD: NetBSD.dist.ia64,v 1.1 2019/02/17 05:29:08 mrg Exp $
./usr/include/ia64

3
etc/mtree/NetBSD.dist.ofppc
View File

@ -1,3 +0,0 @@
# $NetBSD: NetBSD.dist.ofppc,v 1.1 2019/03/01 04:39:37 mrg Exp $
./usr/include/ofppc

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

@ -1,3 +1,5 @@
# $NetBSD: NetBSD.dist.powerpc,v 1.1 2019/02/17 05:29:08 mrg Exp $ # $NetBSD: NetBSD.dist.powerpc,v 1.2 2019/03/12 10:07:49 mrg Exp $
./usr/include/powerpc ./usr/include/powerpc
./usr/include/powerpc/oea
./usr/include/powerpc/ibm4xx

3
etc/mtree/NetBSD.dist.sparc
View File

@ -1,4 +1,3 @@
# $NetBSD: NetBSD.dist.sparc,v 1.1 2019/02/17 05:29:08 mrg Exp $ # $NetBSD: NetBSD.dist.sparc,v 1.2 2019/03/12 10:07:49 mrg Exp $
./usr/include/sparc
./usr/include/sparc64 ./usr/include/sparc64

3
etc/mtree/NetBSD.dist.sparc64
View File

@ -1,4 +1,3 @@
# $NetBSD: NetBSD.dist.sparc64,v 1.12 2019/02/17 05:29:08 mrg Exp $ # $NetBSD: NetBSD.dist.sparc64,v 1.13 2019/03/12 10:07:49 mrg Exp $
./usr/include/sparc
./usr/include/sparc64 ./usr/include/sparc64

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

@ -0,0 +1,3 @@
# $NetBSD: NetBSD.dist.sun2,v 1.1 2019/03/12 10:07:49 mrg Exp $
./usr/include/sun68k

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

@ -0,0 +1,3 @@
# $NetBSD: NetBSD.dist.sun3,v 1.1 2019/03/12 10:07:49 mrg Exp $
./usr/include/sun68k

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

@ -1,6 +1,5 @@
# $NetBSD: NetBSD.dist.x86_64,v 1.13 2019/02/09 21:43:23 mrg Exp $ # $NetBSD: NetBSD.dist.x86_64,v 1.14 2019/03/12 10:07:49 mrg Exp $
./usr/include/amd64
./usr/include/dev/nvmm ./usr/include/dev/nvmm
./usr/include/dev/nvmm/x86 ./usr/include/dev/nvmm/x86
./usr/include/i386 ./usr/include/i386