Module Name: src
Committed By: mrg
Date: Tue Mar 12 10:07:50 UTC 2019
Modified Files:
src/etc/mtree: Makefile NetBSD.dist.i386 NetBSD.dist.powerpc
NetBSD.dist.sparc NetBSD.dist.sparc64 NetBSD.dist.x86_64
Added Files:
src/etc/mtree: NetBSD.dist.sun2 NetBSD.dist.sun3
Removed Files:
src/etc/mtree: NetBSD.dist.aarch64 NetBSD.dist.ia64 NetBSD.dist.ofppc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/etc/mtree/Makefile
cvs rdiff -u -r1.6 -r0 src/etc/mtree/NetBSD.dist.aarch64
cvs rdiff -u -r1.1 -r1.2 src/etc/mtree/NetBSD.dist.i386 \
src/etc/mtree/NetBSD.dist.powerpc src/etc/mtree/NetBSD.dist.sparc
cvs rdiff -u -r1.1 -r0 src/etc/mtree/NetBSD.dist.ia64 \
src/etc/mtree/NetBSD.dist.ofppc
cvs rdiff -u -r1.12 -r1.13 src/etc/mtree/NetBSD.dist.sparc64
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.sun2 \
src/etc/mtree/NetBSD.dist.sun3
cvs rdiff -u -r1.13 -r1.14 src/etc/mtree/NetBSD.dist.x86_64
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.40 src/etc/mtree/Makefile:1.41
--- src/etc/mtree/Makefile:1.40 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/Makefile Tue Mar 12 10:07:49 2019
@@ -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: NetBSD.dist.tmp
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 @@ distrib-dirs: .PHONY check_DESTDIR NetBS
.endif # DISTRIBUTION_DONE # }
CLEANFILES+= NetBSD.dist NetBSD.dist.tmp
+CLEANFILES+= NetBSD.dist.machine
CLEANFILES+= NetBSD.dist.compat
CLEANFILES+= NetBSD.dist.tests.compat
Index: src/etc/mtree/NetBSD.dist.i386
diff -u src/etc/mtree/NetBSD.dist.i386:1.1 src/etc/mtree/NetBSD.dist.i386:1.2
--- src/etc/mtree/NetBSD.dist.i386:1.1 Sat Feb 9 00:15:28 2019
+++ src/etc/mtree/NetBSD.dist.i386 Tue Mar 12 10:07:49 2019
@@ -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
Index: src/etc/mtree/NetBSD.dist.powerpc
diff -u src/etc/mtree/NetBSD.dist.powerpc:1.1 src/etc/mtree/NetBSD.dist.powerpc:1.2
--- src/etc/mtree/NetBSD.dist.powerpc:1.1 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/NetBSD.dist.powerpc Tue Mar 12 10:07:49 2019
@@ -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
Index: src/etc/mtree/NetBSD.dist.sparc
diff -u src/etc/mtree/NetBSD.dist.sparc:1.1 src/etc/mtree/NetBSD.dist.sparc:1.2
--- src/etc/mtree/NetBSD.dist.sparc:1.1 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/NetBSD.dist.sparc Tue Mar 12 10:07:49 2019
@@ -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
Index: src/etc/mtree/NetBSD.dist.sparc64
diff -u src/etc/mtree/NetBSD.dist.sparc64:1.12 src/etc/mtree/NetBSD.dist.sparc64:1.13
--- src/etc/mtree/NetBSD.dist.sparc64:1.12 Sun Feb 17 05:29:08 2019
+++ src/etc/mtree/NetBSD.dist.sparc64 Tue Mar 12 10:07:49 2019
@@ -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
Index: src/etc/mtree/NetBSD.dist.x86_64
diff -u src/etc/mtree/NetBSD.dist.x86_64:1.13 src/etc/mtree/NetBSD.dist.x86_64:1.14
--- src/etc/mtree/NetBSD.dist.x86_64:1.13 Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.dist.x86_64 Tue Mar 12 10:07:49 2019
@@ -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
Added files:
Index: src/etc/mtree/NetBSD.dist.sun2
diff -u /dev/null src/etc/mtree/NetBSD.dist.sun2:1.1
--- /dev/null Tue Mar 12 10:07:50 2019
+++ src/etc/mtree/NetBSD.dist.sun2 Tue Mar 12 10:07:49 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.sun2,v 1.1 2019/03/12 10:07:49 mrg Exp $
+
+./usr/include/sun68k
Index: src/etc/mtree/NetBSD.dist.sun3
diff -u /dev/null src/etc/mtree/NetBSD.dist.sun3:1.1
--- /dev/null Tue Mar 12 10:07:50 2019
+++ src/etc/mtree/NetBSD.dist.sun3 Tue Mar 12 10:07:49 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.sun3,v 1.1 2019/03/12 10:07:49 mrg Exp $
+
+./usr/include/sun68k
