[src/trunk]: src/etc/mtree remove the recently added files or added entries f...

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

details:   https://anonhg.NetBSD.org/src/rev/706b28a56bb7
branches:  trunk
changeset: 839930:706b28a56bb7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Mar 12 10:07:49 2019 +0000

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

diffstat:

 etc/mtree/Makefile            |  11 +++++++++--
 etc/mtree/NetBSD.dist.aarch64 |   3 ---
 etc/mtree/NetBSD.dist.i386    |   3 +--
 etc/mtree/NetBSD.dist.ia64    |   3 ---
 etc/mtree/NetBSD.dist.ofppc   |   3 ---
 etc/mtree/NetBSD.dist.powerpc |   4 +++-
 etc/mtree/NetBSD.dist.sparc   |   3 +--
 etc/mtree/NetBSD.dist.sparc64 |   3 +--
 etc/mtree/NetBSD.dist.sun2    |   3 +++
 etc/mtree/NetBSD.dist.sun3    |   3 +++
 etc/mtree/NetBSD.dist.x86_64  |   3 +--
 11 files changed, 22 insertions(+), 20 deletions(-)

diffs (120 lines):

diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/Makefile
--- a/etc/mtree/Makefile        Tue Mar 12 08:29:52 2019 +0000
+++ b/etc/mtree/Makefile        Tue Mar 12 10:07:49 2019 +0000
@@ -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>
 
+EXTRA_DIST_FILES=      NetBSD.dist.machine     # autogenerated
+
 .if ${MKX11} != "no"
-EXTRA_DIST_FILES=      NetBSD.dist.Xorg
+EXTRA_DIST_FILES+=     NetBSD.dist.Xorg
 .endif
 
 # Derived from MACHINE_CPU, but keeping 32/64bit for most.
@@ -77,6 +79,10 @@
 NetBSD.dist.tmp: NetBSD.dist.base ${EXTRA_DIST_FILES}
        ${TOOL_CAT} ${.ALLSRC} > ${.TARGET}
 
+NetBSD.dist.machine:
+       ${MKCREATE}
+       echo ./usr/include/${MACHINE} > ${.TARGET}
+
 NetBSD.dist.compat: NetBSD.dist.compat.in mkcompat.awk
        ${MKCREATE}
        ${TOOL_AWK} -f ${.ALLSRC:M*.awk} -v COMPATDIRS=${ARCHDIR_SUBDIR:T:Q} \
@@ -130,6 +136,7 @@
 .endif # DISTRIBUTION_DONE                                             # }
 
 CLEANFILES+=   NetBSD.dist NetBSD.dist.tmp
+CLEANFILES+=   NetBSD.dist.machine
 CLEANFILES+=   NetBSD.dist.compat
 CLEANFILES+=   NetBSD.dist.tests.compat
 
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.aarch64
--- a/etc/mtree/NetBSD.dist.aarch64     Tue Mar 12 08:29:52 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: NetBSD.dist.aarch64,v 1.6 2019/02/17 05:29:08 mrg Exp $
-
-./usr/include/aarch64
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.i386
--- a/etc/mtree/NetBSD.dist.i386        Tue Mar 12 08:29:52 2019 +0000
+++ b/etc/mtree/NetBSD.dist.i386        Tue Mar 12 10:07:49 2019 +0000
@@ -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/xen
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.ia64
--- a/etc/mtree/NetBSD.dist.ia64        Tue Mar 12 08:29:52 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: NetBSD.dist.ia64,v 1.1 2019/02/17 05:29:08 mrg Exp $
-
-./usr/include/ia64
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.ofppc
--- a/etc/mtree/NetBSD.dist.ofppc       Tue Mar 12 08:29:52 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-#      $NetBSD: NetBSD.dist.ofppc,v 1.1 2019/03/01 04:39:37 mrg Exp $
-
-./usr/include/ofppc
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.powerpc
--- a/etc/mtree/NetBSD.dist.powerpc     Tue Mar 12 08:29:52 2019 +0000
+++ b/etc/mtree/NetBSD.dist.powerpc     Tue Mar 12 10:07:49 2019 +0000
@@ -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/oea
+./usr/include/powerpc/ibm4xx
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.sparc
--- a/etc/mtree/NetBSD.dist.sparc       Tue Mar 12 08:29:52 2019 +0000
+++ b/etc/mtree/NetBSD.dist.sparc       Tue Mar 12 10:07:49 2019 +0000
@@ -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
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.sparc64
--- a/etc/mtree/NetBSD.dist.sparc64     Tue Mar 12 08:29:52 2019 +0000
+++ b/etc/mtree/NetBSD.dist.sparc64     Tue Mar 12 10:07:49 2019 +0000
@@ -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
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.sun2
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.dist.sun2        Tue Mar 12 10:07:49 2019 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: NetBSD.dist.sun2,v 1.1 2019/03/12 10:07:49 mrg Exp $
+
+./usr/include/sun68k
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.sun3
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.dist.sun3        Tue Mar 12 10:07:49 2019 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: NetBSD.dist.sun3,v 1.1 2019/03/12 10:07:49 mrg Exp $
+
+./usr/include/sun68k
diff -r 0388eb93c15e -r 706b28a56bb7 etc/mtree/NetBSD.dist.x86_64
--- a/etc/mtree/NetBSD.dist.x86_64      Tue Mar 12 08:29:52 2019 +0000
+++ b/etc/mtree/NetBSD.dist.x86_64      Tue Mar 12 10:07:49 2019 +0000
@@ -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/x86
 ./usr/include/i386