Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/etc/mtree separate out the arch-specific and compat-specific...



details:   https://anonhg.NetBSD.org/src/rev/e8359aa44eff
branches:  trunk
changeset: 996841:e8359aa44eff
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Feb 09 21:43:23 2019 +0000

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

diffstat:

 etc/mtree/Makefile                |  12 +++++++-----
 etc/mtree/NetBSD.compat.aarch64   |   4 ++++
 etc/mtree/NetBSD.compat.mips64eb  |   5 +++++
 etc/mtree/NetBSD.compat.mips64el  |   5 +++++
 etc/mtree/NetBSD.compat.powerpc64 |   4 ++++
 etc/mtree/NetBSD.compat.riscv64   |   4 ++++
 etc/mtree/NetBSD.compat.sparc64   |   4 ++++
 etc/mtree/NetBSD.compat.x86_64    |   4 ++++
 etc/mtree/NetBSD.dist.aarch64     |   4 ----
 etc/mtree/NetBSD.dist.earm        |   2 --
 etc/mtree/NetBSD.dist.m68k        |   3 +++
 etc/mtree/NetBSD.dist.mips64eb    |   5 -----
 etc/mtree/NetBSD.dist.mips64el    |   5 -----
 etc/mtree/NetBSD.dist.powerpc64   |   4 ----
 etc/mtree/NetBSD.dist.riscv64     |   4 ----
 etc/mtree/NetBSD.dist.sparc64     |   4 ----
 etc/mtree/NetBSD.dist.x86_64      |   4 +---
 17 files changed, 41 insertions(+), 36 deletions(-)

diffs (169 lines):

diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/Makefile
--- a/etc/mtree/Makefile        Sat Feb 09 21:05:48 2019 +0000
+++ b/etc/mtree/Makefile        Sat Feb 09 21:43:23 2019 +0000
@@ -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 @@
 # 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 @@
 .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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.aarch64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.aarch64   Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.mips64eb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.mips64eb  Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.mips64el
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.mips64el  Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.powerpc64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.powerpc64 Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.riscv64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.riscv64   Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.sparc64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.sparc64   Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.compat.x86_64
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.compat.x86_64    Sat Feb 09 21:43:23 2019 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.aarch64
--- a/etc/mtree/NetBSD.dist.aarch64     Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.earm
--- a/etc/mtree/NetBSD.dist.earm        Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#      $NetBSD: NetBSD.dist.earm,v 1.3 2015/06/19 18:16:06 matt Exp $
-
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.m68k
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/mtree/NetBSD.dist.m68k        Sat Feb 09 21:43:23 2019 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: NetBSD.dist.m68k,v 1.1 2019/02/09 21:43:23 mrg Exp $
+
+./usr/include/m68k
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.mips64eb
--- a/etc/mtree/NetBSD.dist.mips64eb    Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: NetBSD.dist.mips64eb,v 1.9 2015/06/19 18:16:06 matt Exp $
-
-./usr/include/g++/bits/mips64
-./usr/include/g++/bits/mips32
-./usr/include/g++/bits/mipso32
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.mips64el
--- a/etc/mtree/NetBSD.dist.mips64el    Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: NetBSD.dist.mips64el,v 1.10 2015/06/19 18:16:06 matt Exp $
-
-./usr/include/g++/bits/mips64
-./usr/include/g++/bits/mips32
-./usr/include/g++/bits/mipso32
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.powerpc64
--- a/etc/mtree/NetBSD.dist.powerpc64   Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.riscv64
--- a/etc/mtree/NetBSD.dist.riscv64     Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.sparc64
--- a/etc/mtree/NetBSD.dist.sparc64     Sat Feb 09 21:05:48 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#      $NetBSD: NetBSD.dist.sparc64,v 1.10 2015/06/19 18:16:06 matt Exp $
-
-./usr/include/g++/bits/sparc
-./usr/include/g++/bits/sparc64
diff -r 6b7d0eb4e663 -r e8359aa44eff etc/mtree/NetBSD.dist.x86_64
--- a/etc/mtree/NetBSD.dist.x86_64      Sat Feb 09 21:05:48 2019 +0000
+++ b/etc/mtree/NetBSD.dist.x86_64      Sat Feb 09 21:43:23 2019 +0000
@@ -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



Home | Main Index | Thread Index | Old Index