D52874.id163393.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52874.id163393.diff
View Options

	Index: release/Makefile.vm
	===================================================================
	--- release/Makefile.vm
	+++ release/Makefile.vm
	@@ -134,6 +134,7 @@
	${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
	${NO_ROOT:DNO_ROOT=true} \
	PKG_CMD=${PKG_CMD:Upkg} \
	+ PKG_ABI=${PKG_ABI} \
	PKG_REPOS_DIR=${PKG_REPOS_DIR:U${.OBJDIR}/${.TARGET}/etc/pkg} \
	PKG_REPO_NAME=${PKG_REPO_NAME:UFreeBSD-ports} \
	PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \
	@@ -192,6 +193,7 @@
	${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
	${NO_ROOT:DNO_ROOT=true} \
	PKG_CMD=${PKG_CMD:Upkg} \
	+ PKG_ABI=${PKG_ABI} \
	PKG_REPOS_DIR=${PKG_REPOS_DIR:U${.OBJDIR}/${.TARGET}-${FORMAT}-${FS}/etc/pkg} \
	PKG_REPO_NAME=${PKG_REPO_NAME:UFreeBSD-ports} \
	PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \
	Index: release/tools/vmimage.subr
	===================================================================
	--- release/tools/vmimage.subr
	+++ release/tools/vmimage.subr
	@@ -94,7 +94,7 @@
	local pkg_cmd
	pkg_cmd="pkg --rootdir ${DESTDIR} --repo-conf-dir ${PKGBASE_REPO_DIR}
	-o ASSUME_ALWAYS_YES=yes -o IGNORE_OSVERSION=yes
	- -o INSTALL_AS_USER=yes "
	+ -o ABI=${PKG_ABI} -o INSTALL_AS_USER=yes "
	$pkg_cmd update
	selected=$($pkg_cmd rquery -U -r FreeBSD-base %n \| \
	vm_filter_base_packages \| vm_extra_filter_base_packages)
	@@ -198,6 +198,7 @@
	for pkg in ${VM_EXTRA_PACKAGES}; do
	INSTALL_AS_USER=yes \
	${PKG_CMD} \
	+ -o PKG_ABI=${PKG_ABI} \
	-o METALOG=${DESTDIR}/METALOG.pkg \
	-o REPOS_DIR=${PKG_REPOS_DIR} \
	-o PKG_DBDIR=${DESTDIR}/var/db/pkg \