Module Name: src
Committed By: matt
Date: Thu Dec 19 01:15:09 UTC 2013
Modified Files:
src/etc [matt-nb5-mips64]: MAKEDEV.awk Makefile
src/etc/mtree [matt-nb5-mips64]: Makefile NetBSD.dist
Added Files:
src/etc/mtree [matt-nb5-mips64]: NetBSD.dist.mips64eb
NetBSD.dist.mips64el
Log Message:
Deal with MACHINE_ARCH of armv7/armv7eb.
Split out mips64 compat dirs.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.10.1 src/etc/MAKEDEV.awk
cvs rdiff -u -r1.359.2.3.4.2 -r1.359.2.3.4.3 src/etc/Makefile
cvs rdiff -u -r1.5 -r1.5.40.1 src/etc/mtree/Makefile
cvs rdiff -u -r1.385.2.1.4.2 -r1.385.2.1.4.3 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r0 -r1.7.2.2 src/etc/mtree/NetBSD.dist.mips64eb
cvs rdiff -u -r0 -r1.8.2.2 src/etc/mtree/NetBSD.dist.mips64el
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.awk
diff -u src/etc/MAKEDEV.awk:1.20 src/etc/MAKEDEV.awk:1.20.10.1
--- src/etc/MAKEDEV.awk:1.20 Wed Apr 30 13:10:49 2008
+++ src/etc/MAKEDEV.awk Thu Dec 19 01:15:09 2013
@@ -1,6 +1,6 @@
#!/usr/bin/awk -
#
-# $NetBSD: MAKEDEV.awk,v 1.20 2008/04/30 13:10:49 martin Exp $
+# $NetBSD: MAKEDEV.awk,v 1.20.10.1 2013/12/19 01:15:09 matt Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -55,7 +55,7 @@ BEGIN {
# file with major definitions
majors[0] = "conf/majors"
- if ((maarch == "arm" || maarch == "armeb") && system("test -f '" top "arch/" machine "/conf/majors." machine "'") != 0)
+ if ((maarch == "arm" || maarch == "armeb" || maarch == "armv7" || maarch == "armv7eb") && system("test -f '" top "arch/" machine "/conf/majors." machine "'") != 0)
majors[1] = "arch/arm/conf/majors.arm32";
else if (machine == "sbmips")
majors[1] = "arch/evbmips/conf/majors.evbmips";
@@ -211,7 +211,7 @@ BEGIN {
print "# Generated from:"
# MAKEDEV.awk (this script) RCS Id
- ARCSID = "$NetBSD: MAKEDEV.awk,v 1.20 2008/04/30 13:10:49 martin Exp $"
+ ARCSID = "$NetBSD: MAKEDEV.awk,v 1.20.10.1 2013/12/19 01:15:09 matt Exp $"
gsub(/\$/, "", ARCSID)
print "# " ARCSID
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.359.2.3.4.2 src/etc/Makefile:1.359.2.3.4.3
--- src/etc/Makefile:1.359.2.3.4.2 Wed Apr 21 05:21:22 2010
+++ src/etc/Makefile Thu Dec 19 01:15:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.359.2.3.4.2 2010/04/21 05:21:22 matt Exp $
+# $NetBSD: Makefile,v 1.359.2.3.4.3 2013/12/19 01:15:09 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -401,12 +401,21 @@ distrib-dirs: .PHONY check_DESTDIR
# XXX: It would be nice if a single mtree invocation could both
# append to the metalog and do real work. Instead, we have to
# repeat the command twice in slightly different ways.
- ${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist -N ${.CURDIR} \
- -p ${DESTDIR}/ -U ${TOOL_MTREE.unpriv}
+ ${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist \
+ -N ${.CURDIR} -p ${DESTDIR}/ -U ${TOOL_MTREE.unpriv}
+.if exists(${.CURDIR}/mtree/NetBSD.dist.${MACHINE_ARCH})
+ ${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist.${MACHINE_ARCH} \
+ -N ${.CURDIR} -p ${DESTDIR}/ -U ${TOOL_MTREE.unpriv}
+.endif
.if ${MKUNPRIVED} != "no" # {
- ${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist -N ${.CURDIR} \
- -p ${DESTDIR}/ -C -k all | \
+ ${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist \
+ -N ${.CURDIR} -p ${DESTDIR}/ -C -k all | \
+ ${TOOL_AWK} '/ optional/ {next} // {print}' | ${METALOG.add}
+.if exists(${.CURDIR}/mtree/NetBSD.dist.${MACHINE_ARCH})
+ ${TOOL_MTREE} -def ${.CURDIR}/mtree/NetBSD.dist.${MACHINE_ARCH} \
+ -N ${.CURDIR} -p ${DESTDIR}/ -C -k all | \
${TOOL_AWK} '/ optional/ {next} // {print}' | ${METALOG.add}
+.endif
.endif # MKUNPRIVED # }
.endif # DISTRIBUTION_DONE # }
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.5 src/etc/mtree/Makefile:1.5.40.1
--- src/etc/mtree/Makefile:1.5 Sun May 16 09:53:09 2004
+++ src/etc/mtree/Makefile Thu Dec 19 01:15:09 2013
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/05/16 09:53:09 lukem Exp $
+# $NetBSD: Makefile,v 1.5.40.1 2013/12/19 01:15:09 matt Exp $
CONFIGFILES= NetBSD.dist special
+.if exists(${.CURDIR}/NetBSD.dist.${MACHINE_ARCH})
+CONFIGFILES+= NetBSD.dist.${MACHINE_ARCH}
+.endif
FILESDIR= /etc/mtree
.include <bsd.prog.mk>
Index: src/etc/mtree/NetBSD.dist
diff -u src/etc/mtree/NetBSD.dist:1.385.2.1.4.2 src/etc/mtree/NetBSD.dist:1.385.2.1.4.3
--- src/etc/mtree/NetBSD.dist:1.385.2.1.4.2 Wed Apr 21 05:21:23 2010
+++ src/etc/mtree/NetBSD.dist Thu Dec 19 01:15:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist,v 1.385.2.1.4.2 2010/04/21 05:21:23 matt Exp $
+# $NetBSD: NetBSD.dist,v 1.385.2.1.4.3 2013/12/19 01:15:09 matt Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -511,12 +511,6 @@
./usr/include/ufs/ufs
./usr/include/uvm
./usr/lib
-./usr/lib/64
-./usr/lib/64/i18n
-./usr/lib/64/security
-./usr/lib/o32
-./usr/lib/o32/i18n
-./usr/lib/o32/security
./usr/lib/i18n
./usr/lib/pkgconfig
./usr/lib/security
Added files:
Index: src/etc/mtree/NetBSD.dist.mips64eb
diff -u /dev/null src/etc/mtree/NetBSD.dist.mips64eb:1.7.2.2
--- /dev/null Thu Dec 19 01:15:09 2013
+++ src/etc/mtree/NetBSD.dist.mips64eb Thu Dec 19 01:15:09 2013
@@ -0,0 +1,6 @@
+./usr/lib/64
+./usr/lib/64/i18n
+./usr/lib/64/security
+./usr/lib/o32
+./usr/lib/o32/i18n
+./usr/lib/o32/security
Index: src/etc/mtree/NetBSD.dist.mips64el
diff -u /dev/null src/etc/mtree/NetBSD.dist.mips64el:1.8.2.2
--- /dev/null Thu Dec 19 01:15:09 2013
+++ src/etc/mtree/NetBSD.dist.mips64el Thu Dec 19 01:15:09 2013
@@ -0,0 +1,6 @@
+./usr/lib/64
+./usr/lib/64/i18n
+./usr/lib/64/security
+./usr/lib/o32
+./usr/lib/o32/i18n
+./usr/lib/o32/security
