From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 3 Dec 2012 14:06:12 +0000 (+0000)
Subject: Ensure correct NetBSD sources checkout
X-Git-Tag: v3.2.1~172
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/%7B%24global.css%7D?a=commitdiff_plain;h=73817adec0b85a3e0f5604f37d0c380ad80e9be7;p=minix.git

Ensure correct NetBSD sources checkout

Previously, under some circumstances, the make command could
yield netbsdsrc in other directories than the source directory,
as expected.

This patch fixes this behaviour, by first changing to the expected
directory, and only at the end going back to the original directory.
---

diff --git a/releasetools/Makefile b/releasetools/Makefile
index 5d90d2714..542c9da74 100644
--- a/releasetools/Makefile
+++ b/releasetools/Makefile
@@ -111,15 +111,18 @@ install:
 # download and update NetBSD reference sources.
 nbsd_fetch:
 	export CVS_RSH=ssh; 							\
+	export OLDPWD=`pwd`;							\
 	echo "retrieving hierarchies from ${NBSD_CVSROOT}";			\
 	IFS=,;									\
-	cat nbsd_ports | grep -v '^#' | while read port ;			\
+	cd ..;									\
+	cat releasetools/nbsd_ports | grep -v '^#' | while read port ;		\
 	do	set $$port;							\
 		date=$$1; minixpath=$$2; origpath=$$3;				\
 		if [ $$# -lt 3 ]; then origpath=$$2; fi;			\
 		echo "retrieving $$origpath ..";				\
-		cd .. && cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \
-	done
+		cvs -q -d ${NBSD_CVSROOT} co -N -D "$$date UTC" -d nbsdsrc "src/$$origpath" ; \
+	done;									\
+	cd $${OLDPWD};
 
 nbsd_diff:
 	find .. -name minix-port.patch | xargs rm