Subject: proposed change to src/etc/Makefile
To: None <>
From: Matthias Drochner <>
List: current-users
Date: 12/06/2002 15:28:36
This is a multipart MIME message.

Content-Type: text/plain; charset=us-ascii

I'm proposing two changes:
-call "mtree" with the -N option to get the actual/right UIDs
 (from the src tree, not from the build machine)
-don't overwrite the /sys symlink if already present, it might point
 to a non-standard place for good reasons

I'm wondering how people could cross-build or update after a
password file addition without the first one... Or am I
missing something?

best regards

Content-Type: text/plain ; name="mfpatch"; charset=us-ascii
Content-Description: mfpatch
Content-Disposition: attachment; filename="mfpatch"

Index: etc/Makefile
RCS file: /cvsroot/basesrc/etc/Makefile,v
retrieving revision 1.233
diff -u -r1.233 Makefile
--- etc/Makefile	2002/12/02 13:18:03	1.233
+++ etc/Makefile	2002/12/06 14:07:16
@@ -275,10 +275,11 @@
 distrib-dirs: check_DESTDIR
 	${INSTALL_DIR} -o root -g wheel -m 755 ${BASE_PKG} ${DESTDIR}
-	${MTREE} -def mtree/NetBSD.dist -p ${DESTDIR}/ -U ${UNPRIVED:D-W}
-	rm -f ${DESTDIR}/sys
-	${INSTALL_SYMLINK} -o root -g wheel -m 755 ${BASE_PKG} \
-	    usr/src/sys ${DESTDIR}/sys
+	${MTREE} -def mtree/NetBSD.dist -p ${DESTDIR}/ -U ${UNPRIVED:D-W} -N .
+	if [ ! -e ${DESTDIR}/sys ]; then \
+		${INSTALL_SYMLINK} -o root -g wheel -m 755 ${BASE_PKG} \
+	    		usr/src/sys ${DESTDIR}/sys; \
+	fi
 release snapshot: check_DESTDIR check_RELEASEDIR .WAIT \
 		    distribution .WAIT \