From d7ffe6479333821f757dc71f47a3133fcf98c9ca Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sun, 27 Jul 2008 22:12:03 +0000 Subject: [PATCH] MFC: Actually install packages into ${ISOROOT}. Submitted-by: corecode Reported-by: M.K. Dragonfly-bug: --- nrelease/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nrelease/Makefile b/nrelease/Makefile index a76786da33..059f3ccfcc 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -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 -- 2.11.4.GIT