Fix the installer_quickrel target. Also fix the pkgsrc bootstrap, not
authorMatthew Dillon <dillon@dragonflybsd.org>
Fri, 23 Dec 2005 20:29:57 +0000 (20:29 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Fri, 23 Dec 2005 20:29:57 +0000 (20:29 +0000)
enough data was being copied into ISOROOT to run the bootstrap.

nrelease/Makefile

index 4e2f5c9..54091f6 100644 (file)
@@ -1,9 +1,9 @@
-# $DragonFly: src/nrelease/Makefile,v 1.48 2005/12/22 23:23:32 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.49 2005/12/23 20:29:57 dillon Exp $
 #
 
 # compat target
 installer_release: release
-installer_quickrel: 
+installer_quickrel: quickrel
 installer_realquickrel: realquickrel
 installer_fetch: fetch
 
@@ -127,8 +127,9 @@ customizeiso:
 .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
+       cpdup ${PKGSRC_PKG_PATH}/${PKGSRC_BOOTSTRAP_KIT} ${ISOROOT}/tmp/bootstrap
+       chroot ${ISOROOT} csh -c "cd /tmp/bootstrap/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