Module Name: src
Committed By: dyoung
Date: Fri Apr 23 19:21:08 UTC 2010
Modified Files:
src/etc/mtree: Makefile
src/usr.sbin/postinstall: postinstall
Log Message:
Do not try in postinstall(8) to replicate the code in etc/mtree/Makefile
that assembles /etc/mtree/NetBSD.dist. Instead, use the Makefile's
new target, emit_dist_file, to assemble the correct NetBSD.dist.
Previously, 'postinstall -m amd64 -s $SRC_TOP' would install a
NetBSD.dist that was missing /usr/lib/i386/ et cetera.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/etc/mtree/Makefile
cvs rdiff -u -r1.107 -r1.108 src/usr.sbin/postinstall/postinstall
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.15 src/etc/mtree/Makefile:1.16
--- src/etc/mtree/Makefile:1.15 Mon Jan 18 10:25:29 2010
+++ src/etc/mtree/Makefile Fri Apr 23 19:21:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 10:25:29 plunky Exp $
+# $NetBSD: Makefile,v 1.16 2010/04/23 19:21:08 dyoung Exp $
.include <bsd.own.mk>
@@ -39,6 +39,9 @@
TOOL_MTREE.unpriv= -W
.endif
+emit_dist_file:
+ ${TOOL_CAT} ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
+
distrib-dirs: .PHONY check_DESTDIR NetBSD.dist
.if !defined(DISTRIBUTION_DONE) # {
# Create DESTDIR using HOST_INSTALL_DIR, not INSTALL_DIR, because
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.107 src/usr.sbin/postinstall/postinstall:1.108
--- src/usr.sbin/postinstall/postinstall:1.107 Thu Dec 24 21:52:57 2009
+++ src/usr.sbin/postinstall/postinstall Fri Apr 23 19:21:08 2010
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.107 2009/12/24 21:52:57 christos Exp $
+# $NetBSD: postinstall,v 1.108 2010/04/23 19:21:08 dyoung Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -933,12 +933,7 @@
if ! $SOURCEMODE; then
MTREE_DIR="${SRC_DIR}/etc/mtree"
else
- extrafile=/dev/null
- if [ "${MKX11}" != "no" ]; then
- get_makevar X11FLAVOUR
- extrafile="${SRC_DIR}/etc/mtree/NetBSD.dist.${X11FLAVOUR}"
- fi
- cat "${SRC_DIR}/etc/mtree/NetBSD.dist.base" "${extrafile}" > \
+ ${MAKE} -C ${SRC_DIR}/etc/mtree emit_dist_file > \
"${SCRATCHDIR}/NetBSD.dist"
MTREE_DIR="${SCRATCHDIR}"
fi
