Module Name: src
Committed By: mrg
Date: Sat Feb 9 21:43:23 UTC 2019
Modified Files:
src/etc/mtree: Makefile NetBSD.dist.x86_64
Added Files:
src/etc/mtree: NetBSD.compat.aarch64 NetBSD.compat.mips64eb
NetBSD.compat.mips64el NetBSD.compat.powerpc64
NetBSD.compat.riscv64 NetBSD.compat.sparc64 NetBSD.compat.x86_64
NetBSD.dist.m68k
Removed Files:
src/etc/mtree: NetBSD.dist.aarch64 NetBSD.dist.earm
NetBSD.dist.mips64eb NetBSD.dist.mips64el NetBSD.dist.powerpc64
NetBSD.dist.riscv64 NetBSD.dist.sparc64
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/etc/mtree/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.compat.aarch64 \
src/etc/mtree/NetBSD.compat.mips64eb src/etc/mtree/NetBSD.compat.mips64el \
src/etc/mtree/NetBSD.compat.powerpc64 src/etc/mtree/NetBSD.compat.riscv64 \
src/etc/mtree/NetBSD.compat.sparc64 src/etc/mtree/NetBSD.compat.x86_64 \
src/etc/mtree/NetBSD.dist.m68k
cvs rdiff -u -r1.4 -r0 src/etc/mtree/NetBSD.dist.aarch64
cvs rdiff -u -r1.3 -r0 src/etc/mtree/NetBSD.dist.earm \
src/etc/mtree/NetBSD.dist.powerpc64
cvs rdiff -u -r1.9 -r0 src/etc/mtree/NetBSD.dist.mips64eb
cvs rdiff -u -r1.10 -r0 src/etc/mtree/NetBSD.dist.mips64el \
src/etc/mtree/NetBSD.dist.sparc64
cvs rdiff -u -r1.2 -r0 src/etc/mtree/NetBSD.dist.riscv64
cvs rdiff -u -r1.12 -r1.13 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.38 src/etc/mtree/Makefile:1.39
--- src/etc/mtree/Makefile:1.38 Sat Feb 9 02:04:19 2019
+++ src/etc/mtree/Makefile Sat Feb 9 21:43:23 2019
@@ -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 #
.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
Index: src/etc/mtree/NetBSD.dist.x86_64
diff -u src/etc/mtree/NetBSD.dist.x86_64:1.12 src/etc/mtree/NetBSD.dist.x86_64:1.13
--- src/etc/mtree/NetBSD.dist.x86_64:1.12 Fri Feb 8 23:27:14 2019
+++ src/etc/mtree/NetBSD.dist.x86_64 Sat Feb 9 21:43:23 2019
@@ -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
Added files:
Index: src/etc/mtree/NetBSD.compat.aarch64
diff -u /dev/null src/etc/mtree/NetBSD.compat.aarch64:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.aarch64 Sat Feb 9 21:43:23 2019
@@ -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
Index: src/etc/mtree/NetBSD.compat.mips64eb
diff -u /dev/null src/etc/mtree/NetBSD.compat.mips64eb:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.mips64eb Sat Feb 9 21:43:23 2019
@@ -0,0 +1,5 @@
+# $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
+./usr/include/g++/bits/mipso32
Index: src/etc/mtree/NetBSD.compat.mips64el
diff -u /dev/null src/etc/mtree/NetBSD.compat.mips64el:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.mips64el Sat Feb 9 21:43:23 2019
@@ -0,0 +1,5 @@
+# $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
+./usr/include/g++/bits/mipso32
Index: src/etc/mtree/NetBSD.compat.powerpc64
diff -u /dev/null src/etc/mtree/NetBSD.compat.powerpc64:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.powerpc64 Sat Feb 9 21:43:23 2019
@@ -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
Index: src/etc/mtree/NetBSD.compat.riscv64
diff -u /dev/null src/etc/mtree/NetBSD.compat.riscv64:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.riscv64 Sat Feb 9 21:43:23 2019
@@ -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
Index: src/etc/mtree/NetBSD.compat.sparc64
diff -u /dev/null src/etc/mtree/NetBSD.compat.sparc64:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.sparc64 Sat Feb 9 21:43:23 2019
@@ -0,0 +1,4 @@
+# $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
Index: src/etc/mtree/NetBSD.compat.x86_64
diff -u /dev/null src/etc/mtree/NetBSD.compat.x86_64:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.compat.x86_64 Sat Feb 9 21:43:23 2019
@@ -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
Index: src/etc/mtree/NetBSD.dist.m68k
diff -u /dev/null src/etc/mtree/NetBSD.dist.m68k:1.1
--- /dev/null Sat Feb 9 21:43:23 2019
+++ src/etc/mtree/NetBSD.dist.m68k Sat Feb 9 21:43:23 2019
@@ -0,0 +1,3 @@
+# $NetBSD: NetBSD.dist.m68k,v 1.1 2019/02/09 21:43:23 mrg Exp $
+
+./usr/include/m68k
