MFC:
authorSascha Wildner <swildner@dragonflybsd.org>
Sun, 27 Jul 2008 22:12:03 +0000 (27 22:12 +0000)
committerSascha Wildner <swildner@dragonflybsd.org>
Sun, 27 Jul 2008 22:12:03 +0000 (27 22:12 +0000)
Actually install packages into ${ISOROOT}.

Submitted-by: corecode
Reported-by: M.K. <mk@freeweb.ozi.nu>
Dragonfly-bug: <http://bugs.dragonflybsd.org/issue1092>

nrelease/Makefile

index a76786d..059f3cc 100644 (file)
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.85 2008/07/09 07:54:34 swildner Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.85.2.1 2008/07/27 22:12:03 swildner Exp $
 #
 
 #########################################################################
@@ -230,7 +230,7 @@ customizeiso:
        cp -R ${.CURDIR}/../etc/${UPGRADE_ITEM} ${ISOROOT}/etc/${UPGRADE_ITEM}
 .endfor
 .for PKG in ${PKGSRC_PACKAGES}
-       ${ENVCMD} PKG_PATH=${PKGSRC_PKG_PATH} ${PKGBIN_PKG_ADD} -K ${ISOROOT}${PKGSRC_DB} -I ${PKG}
+       ${ENVCMD} PKG_PATH=${PKGSRC_PKG_PATH} ${PKGBIN_PKG_ADD} -I -K ${ISOROOT}${PKGSRC_DB} -p ${ISOROOT}${PKGSRC_PREFIX} ${PKG}
 .endfor
        find ${ISOROOT}${PKGSRC_DB} -name +CONTENTS -type f -exec sed -i '' -e 's,${ISOROOT},,' -- {} \;
        ${PKGBIN_PKG_ADMIN} -K ${ISOROOT}${PKGSRC_DB} rebuild