From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Thu, 22 Dec 2005 23:23:34 +0000 (+0000)
Subject: run ./bootstrap in a chroot so it configures the correct paths in the
X-Git-Tag: v2.0.1~5463
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/d08963d36d3090913e0d8dd4fc550daa70d17dfe

run ./bootstrap in a chroot so it configures the correct paths in the
pkgsrc binaries (there does not appear to be a way to specify a target
install location different from the one used to locate pkgsrc binaries).

Set the default working directory to /usr/obj/pkgsrc rather then creating
working directories inside /usr/pkgsrc.  This will save annoyances for
people who mount /usr/pkgsrc via NFS.

Install a default /etc/mk.conf as part of the root skeleton.
---

diff --git a/nrelease/Makefile b/nrelease/Makefile
index c9175c1211..4e2f5c9de8 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.47 2005/12/22 06:32:10 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.48 2005/12/22 23:23:32 dillon Exp $
 #
 
 # compat target
@@ -124,12 +124,12 @@ buildiso:
 
 customizeiso:
 	(cd ${PKGSRC_PKG_PATH}; tar xzpf ${PKGSRC_BOOTSTRAP_KIT}.tgz)
-	cd ${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT}/bootstrap && \
-		./bootstrap --workdir=${NRLOBJDIR}/nrelease/bootstrap-workdir \
-		--prefix=${ISOROOT}/usr/pkg
 .for ROOTSKEL in ${ROOTSKELS}
 	cpdup -X cpignore -o ${ROOTSKEL} ${ISOROOT}
 .endfor
+	cpdup ${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT}/bootstrap ${ISOROOT}/tmp/bootstrap
+	chroot ${ISOROOT} csh -c "cd /tmp/bootstrap; ./bootstrap"
+	rm -rf ${ISOROOT}/tmp/bootstrap ${ISOROOT}/usr/obj/pkgsrc
 	rm -rf `find ${ISOROOT} -type d -name CVS -print`
 	rm -rf ${ISOROOT}/usr/local/share/pristine
 	pwd_mkdb -p -d ${ISOROOT}/etc ${ISOROOT}/etc/master.passwd
diff --git a/nrelease/mk.conf.pkgsrc b/nrelease/mk.conf.pkgsrc
index 83492cbd8e..0f53f55752 100644
--- a/nrelease/mk.conf.pkgsrc
+++ b/nrelease/mk.conf.pkgsrc
@@ -1,6 +1,6 @@
 # Generated from nrelease
 #
-# $DragonFly: src/nrelease/Attic/mk.conf.pkgsrc,v 1.1 2005/12/22 06:32:10 dillon Exp $
+# $DragonFly: src/nrelease/Attic/mk.conf.pkgsrc,v 1.2 2005/12/22 23:23:32 dillon Exp $
 .ifdef BSD_PKG_MK
 
 PKG_DBDIR=/var/db/pkg
@@ -9,5 +9,6 @@ VARBASE=/var
 FETCH_CMD=/usr/pkg/bin/ftp
 PAX=/usr/pkg/bin/pax
 X11_TYPE=xorg
+WRKOBJDIR=/usr/obj/pkgsrc
 
 .endif
diff --git a/nrelease/mk.conf.pkgsrc b/nrelease/root/etc/mk.conf
similarity index 61%
copy from nrelease/mk.conf.pkgsrc
copy to nrelease/root/etc/mk.conf
index 83492cbd8e..6e2665c674 100644
--- a/nrelease/mk.conf.pkgsrc
+++ b/nrelease/root/etc/mk.conf
@@ -1,6 +1,6 @@
 # Generated from nrelease
 #
-# $DragonFly: src/nrelease/Attic/mk.conf.pkgsrc,v 1.1 2005/12/22 06:32:10 dillon Exp $
+# $DragonFly: src/nrelease/root/etc/mk.conf,v 1.1 2005/12/22 23:23:34 dillon Exp $
 .ifdef BSD_PKG_MK
 
 PKG_DBDIR=/var/db/pkg
@@ -9,5 +9,6 @@ VARBASE=/var
 FETCH_CMD=/usr/pkg/bin/ftp
 PAX=/usr/pkg/bin/pax
 X11_TYPE=xorg
+WRKOBJDIR=/usr/obj/pkgsrc
 
 .endif