diff --git a/release/Makefile.vm b/release/Makefile.vm
index 8375650cd9aa..25c37ade1121 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -1,302 +1,308 @@
 #
 # Makefile for building virtual machine and cloud provider disk images.
 #
 
 VMTARGETS=	vm-image
 VMFORMATS?=	vhd vmdk qcow2 raw
 .if ${TARGET_ARCH} == riscv64
 VMSIZE?=	6144m
 .else
 VMSIZE?=	5120m
 .endif
 VMFS?=		ufs
 VMFSLIST?=	ufs zfs
 SWAPSIZE?=	1g
 VMBASE?=	vm
 
 VHD_DESC=	Azure, VirtualPC, Hyper-V, Xen disk image
 VMDK_DESC=	VMWare, VirtualBox disk image
 QCOW2_DESC=	Qemu, KVM disk image
 RAW_DESC=	Unformatted raw disk image
 
 .if defined(WITHOUT_QEMU)
 CLOUDWARE_TYPES?= \
 		BASIC-CI
 .else
 CLOUDWARE_TYPES?= AZURE \
 		BASIC-CI \
 		BASIC-CLOUDINIT \
 		EC2 \
 		GCE \
 		ORACLE \
 		VAGRANT
 .endif
 AZURE_FORMAT=	vhdf
 AZURE_FSLIST?=	ufs zfs
 AZURE_DESC=	Microsoft Azure platform image
 BASIC-CI_FORMAT=	raw
 BASIC-CI_FSLIST?=	ufs
 BASIC-CI_DESC=		Image for CI
 BASIC-CLOUDINIT_FORMAT=	raw qcow2
 BASIC-CLOUDINIT_FSLIST?=	ufs zfs
 BASIC-CLOUDINIT_DESC?=	Images for VM with cloudinit disk config support
 EC2_FORMAT=	raw
 EC2_FSLIST?=	ufs zfs
 EC2_FLAVOURS?=	BASE BUILDER CLOUD-INIT SMALL
 EC2-BASE_DESC=	Amazon EC2 image
 EC2-BUILDER_DESC=	Amazon EC2 AMI Builder image
 EC2-CLOUD-INIT_DESC=	Amazon EC2 Cloud-Init image
 EC2-SMALL_DESC=	Amazon EC2 small image
 GCE_FORMAT=	raw
 GCE_FSLIST?=	ufs zfs
 GCE_DESC=	Google Compute Engine image
 ORACLE_FORMAT=	raw
 ORACLE_FSLIST?=	ufs zfs
 ORACLE_DESC=	Oracle Cloud Infrastructure image
 OPENSTACK_FORMAT=qcow2
 OPENSTACK_FSLIST?=	ufs
 OPENSTACK_DESC=	OpenStack platform image
 VAGRANT_FORMAT=	vmdk
 VAGRANT_FSLIST?=	ufs
 VAGRANT_FLAVOURS?=	VIRTUALBOX VMWARE
 VAGRANT-VIRTUALBOX_DESC=	Vagrant Image for VirtualBox
 VAGRANT-VMWARE_DESC=	Vagrant Image for VMWare
 
 .for _CWT in ${CLOUDWARE_TYPES}
 . if defined(${_CWT}_FLAVOURS)
 .  for _CWF in ${${_CWT}_FLAVOURS}
 CLOUDWARE_GEN+=	${_CWT}-${_CWF}
 ${_CWT}-${_CWF}_FORMAT?=	${${_CWT}_FORMAT}
 ${_CWT}-${_CWF}_FSLIST?=	${${_CWT}_FSLIST}
 ${_CWT}-${_CWF}_DESC?=	${${_CWT}_DESC}
 .  endfor
 . else
 CLOUDWARE_GEN+=	${_CWT}
 . endif
 .endfor
 CLOUDWARE?=	${CLOUDWARE_GEN}
 
 .for _V in TYPE BRANCH REVISION
 . if !defined(${_V}) || empty(${_V})
 ${_V}!=	eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V}
 . endif
 .endfor
 
 emulator-portinstall:
 .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static)
 .if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile)
 	env - UNAME_r=${UNAME_r} PATH=$$PATH \
 	    make -C ${PORTSDIR}/emulators/qemu-user-static \
 	    BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \
 	    all install clean
 .else
 .if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
 .endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static
 .endif
 .endif
 	touch ${.TARGET}
 
 .if ${TARGET_ARCH} != ${MACHINE_ARCH} && !defined(WITHOUT_QEMU)
 .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
 QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static
 QEMUTGT=emulator-portinstall
 .endif
 .endif
 QEMUTGT?=
 
 .if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \
   (!defined(WITHOUT_QEMU) && defined(NO_ROOT))
 .error WITHOUT_QEMU requires NO_ROOT (and vice versa)
 .endif
 
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 . for _CW in ${CLOUDWARE}
 .  if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
 ${_CW:tu}CONF?=	${.CURDIR}/tools/${_CW:tl}.conf
 .  endif
 .  for _FS in ${${_CW:tu}_FSLIST}
 .   for _FMT in ${${_CW:tu}_FORMAT}
 CLOUDTARGETS+=	cw-${_CW:tl}-${_FS}-${_FMT}
 CLEANDIRS+=	cw-${_CW:tl}-${_FS}-${_FMT}
 CLEANFILES+=	${_CW:tl}.${_FS}.${_FMT}.img \
 		${_CW:tl}.${_FS}.${_FMT} \
 		${_CW:tl}.${_FS}.${_FMT}.raw
 ${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE=	${_CW:tl}.${_FS}.${_FMT}
 
 # Special handling: EC2 "AMI Builder" images need a copy of the "base" disk
 # built first.
 .if ${_CW} == EC2-BUILDER
 cw-${_CW:tl}-${_FS}-${_FMT}: cw-ec2-base-${_FS}-${_FMT}
 .endif
 
 cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT}
 	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
 		QEMUSTATIC=${QEMUSTATIC} \
 		EC2BASEIMG=${.OBJDIR}/${EC2-BASE${_FS:tu}${_FMT:tu}IMAGE} \
 		${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
 		${NO_ROOT:DNO_ROOT=true} \
+		PKG_CMD=${PKG_CMD:Upkg} \
+		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}} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-F ${"${_CW:MEC2-BUILDER}" != "":?ufs:${_FS}} \
 		-i ${.OBJDIR}/${_CW:tl}.${_FS}.${_FMT}.img -s ${VMSIZE} -f ${_FMT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}${_FMT:tu}IMAGE} -c ${${_CW:tu}CONF} || true
 	touch ${.TARGET}
 .   endfor
 .  endfor
 
 # Hardlinks from "foo.${FMT}" to "foo-${VMFS}.${FMT}".  These can go away once
 # all of the cloudware code knows how to handle multiple filesystem images (or
 # at least knows the name of the UFS image).
 .  for _FMT in ${${_CW:tu}_FORMAT}
 CLOUDTARGETS+=	cw-${_CW:tl}-${_FMT}
 CLEANFILES+=	${_CW:tl}.${_FMT}
 ${_CW:tu}${_FMT:tu}IMAGE=	${_CW:tl}.${_FMT}
 cw-${_CW:tl}-${_FMT}: cw-${_CW:tl}-${VMFS}-${_FMT}
 	ln -f ${${_CW:tu}${VMFS:tu}${_FMT:tu}IMAGE} ${${_CW:tu}${_FMT:tu}IMAGE} || true
 .  endfor
 
 # Targets without a disk format listed are the first disk format on the list
 .  for _FS in ${${_CW:tu}_FSLIST}
 ${_CW:tu}${_FS:tu}IMAGE=	${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT:[1]}
 cw-${_CW:tl}-${_FS}: cw-${_CW:tl}-${_FS}-${${_CW:tu}_FORMAT:[1]}
 .  endfor
 ${_CW:tu}IMAGE=	${_CW:tl}.${${_CW:tu}_FORMAT:[1]}
 cw-${_CW:tl}:	cw-${_CW:tl}-${${_CW:tu}_FORMAT:[1]}
 . endfor
 .endif
 
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 CLEANFILES+=	vm-image
 . for FORMAT in ${VMFORMATS}
 .  for FS in ${VMFSLIST}
 CLEANDIRS+=	vm-image-${FORMAT}-${FS}
 CLEANFILES+=	${FORMAT}.${FS}.img
 CLEANFILES+=	${VMBASE}.${FS}.${FORMAT}
 .  endfor
 . endfor
 .endif
 
 vm-base:	vm-image
 
 vm-image:	${QEMUTGT}
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 . for FORMAT in ${VMFORMATS}
 .  for FS in ${VMFSLIST}
 	mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \
 		QEMUSTATIC=${QEMUSTATIC} \
 		${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
 		${NO_ROOT:DNO_ROOT=true} \
+		PKG_CMD=${PKG_CMD:Upkg} \
+		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}} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr \
 		-d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \
 		-i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} || true
 .  endfor
 . endfor
 .endif
 	touch ${.TARGET}
 
 vm-cloudware:	${CLOUDTARGETS}
 
 list-vmtargets:	list-cloudware
 	@${ECHO}
 	@${ECHO} "Supported virtual machine disk image formats:"
 .for FORMAT in ${VMFORMATS:tu}
 	@${ECHO} "  ${FORMAT:tl}: ${${FORMAT}_DESC}"
 .endfor
 
 list-cloudware:
 .if !empty(CLOUDWARE)
 	@${ECHO}
 	@${ECHO} "Supported cloud hosting provider images:"
 . for _CW in ${CLOUDWARE}
 	@${ECHO} "  ${_CW:tu}: ${${_CW:tu}_DESC}"
 . endfor
 .endif
 
 vm-install:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	mkdir -p ${DESTDIR}/vmimages
 . for FORMAT in ${VMFORMATS}
 .  for FS in ${VMFSLIST}
 	cp -p ${VMBASE}.${FS}.${FORMAT} \
 		${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT}
 .  endfor
 . endfor
 . if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
 .  for FORMAT in ${VMFORMATS}
 .   for FS in ${VMFSLIST}
 	# Don't keep the originals.  There is a copy in ${.OBJDIR} if needed.
 	${XZ_CMD} -f ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT}
 .   endfor
 .  endfor
 . endif
 	cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA512
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA256
 .endif
 
 cloud-install-BASIC-CI:
 	mkdir -p ${DESTDIR}/ciimages
 .for _FS in ${BASIC-CI_FSLIST}
 . for _FMT in ${BASIC-CI_FORMAT}
 	cp -p ${.OBJDIR}/${BASIC-CI${_FS:tu}${_FMT:tu}IMAGE} \
 		${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
 	${XZ_CMD} -f ${DESTDIR}/ciimages/${OSRELEASE}-BASIC-CI-${_FS}.${_FMT}
 . endfor
 .endfor
 	cd ${DESTDIR}/ciimages && sha512 ${OSRELEASE}* > \
 		${DESTDIR}/ciimages/CHECKSUM.SHA512
 	cd ${DESTDIR}/ciimages && sha256 ${OSRELEASE}* > \
 		${DESTDIR}/ciimages/CHECKSUM.SHA256
 
 cloud-install-BASIC-CLOUDINIT:
 	mkdir -p ${DESTDIR}/vmimages
 .for _FS in ${BASIC-CLOUDINIT_FSLIST}
 . for _FMT in ${BASIC-CLOUDINIT_FORMAT}
 	cp -p ${.OBJDIR}/${BASIC-CLOUDINIT${_FS:tu}${_FMT:tu}IMAGE} \
 		${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT}
 	${XZ_CMD} -f ${DESTDIR}/vmimages/${OSRELEASE}-BASIC-CLOUDINIT-${_FS}.${_FMT}
 . endfor
 .endfor
 	cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA512
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA256
 
 CLOUD_INSTALL_TGTS=
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)
 . for _CW in ${CLOUDWARE}
 .  if target(cloud-install-${_CW})
 CLOUD_INSTALL_TGTS+=	cloud-install-${_CW}
 .  endif
 . endfor
 .endif
 cloud-install:	${CLOUD_INSTALL_TGTS}
 
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 vm-release:	${VMTARGETS}
 .else
 vm-release:
 .endif
 
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 cloudware-release:	${CLOUDTARGETS}
 .else
 cloudware-release:
 .endif
 
 .include "${.CURDIR}/Makefile.azure"
 .include "${.CURDIR}/Makefile.ec2"
 .include "${.CURDIR}/Makefile.firecracker"
 .include "${.CURDIR}/Makefile.gce"
 .include "${.CURDIR}/Makefile.oracle"
 .include "${.CURDIR}/Makefile.vagrant"
 .include "${.CURDIR}/Makefile.inc1"
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 41f889a1e665..b3187efd6526 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -1,381 +1,398 @@
 #!/bin/sh
 #
 #
 #
 # Common functions for virtual machine image build scripts.
 #
 
 scriptdir=$(dirname $(realpath $0))
 . ${scriptdir}/../scripts/tools.subr
 . ${scriptdir}/../../tools/boot/install-boot.sh
 
 export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
 trap "cleanup" INT QUIT TRAP ABRT TERM
 
 # Platform-specific large-scale setup
 # Most platforms use GPT, so put that as default, then special cases
 PARTSCHEME=gpt
 ROOTLABEL="gpt"
 case "${TARGET}:${TARGET_ARCH}" in
 	powerpc:powerpc*)
 		PARTSCHEME=mbr
 		ROOTLABEL="ufs"
 		NOSWAP=yes # Can't label swap partition with MBR, so no swap
 	;;
 esac
 
 err() {
 	printf "${@}\n"
 	cleanup
 	return 1
 }
 
 cleanup() {
 	if [ -c "${DESTDIR}/dev/null" ]; then
 		umount_loop ${DESTDIR}/dev 2>/dev/null
 	fi
 
 	return 0
 }
 
 metalog_add_data() {
 	local file mode type
 
 	if [ -n "${NO_ROOT}" ]; then
 		file=$1
 		if [ -f ${DESTDIR}/${file} ]; then
 			type=file
 			mode=${2:-0644}
 		elif [ -d ${DESTDIR}/${file} ]; then
 			type=dir
 			mode=${2:-0755}
 		else
 			echo "metalog_add_data: ${file} not found" >&2
 			return 1
 		fi
 		echo "${file} type=${type} uname=root gname=wheel mode=${mode}" >> \
 		    ${DESTDIR}/METALOG
 	fi
 }
 
 vm_create_base() {
 
 	mkdir -p ${DESTDIR}
 
 	return 0
 }
 
 vm_copy_base() {
 	# Defunct
 	return 0
 }
 
 vm_install_base() {
 	# Installs the FreeBSD userland/kernel to the virtual machine disk.
 
 	cd ${WORLDDIR} && \
 		make DESTDIR=${DESTDIR} ${INSTALLOPTS} \
 		installworld installkernel distribution || \
 		err "\n\nCannot install the base system to ${DESTDIR}."
 
 	# Bootstrap etcupdate(8) database.
 	mkdir -p ${DESTDIR}/var/db/etcupdate
 	etcupdate extract -B \
 		-M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
 		-s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate \
 		-L /dev/stdout ${NO_ROOT:+-N}
 	if [ -n "${NO_ROOT}" ]; then
 		# Reroot etcupdate's internal METALOG to the whole tree
 		sed -n 's,^\.,./var/db/etcupdate/current,p' \
 		    ${DESTDIR}/var/db/etcupdate/current/METALOG | \
 		    env -i LC_COLLATE=C sort >> ${DESTDIR}/METALOG
 		rm ${DESTDIR}/var/db/etcupdate/current/METALOG
 	fi
 
 	echo '# Custom /etc/fstab for FreeBSD VM images' \
 		> ${DESTDIR}/etc/fstab
 	if [ "${VMFS}" != zfs ]; then
 		echo "/dev/${ROOTLABEL}/rootfs   /       ${VMFS}   rw,noatime      1       1" \
 			>> ${DESTDIR}/etc/fstab
 	fi
 	if [ -z "${NOSWAP}" ]; then
 		echo '/dev/gpt/swapfs  none    swap    sw      0       0' \
 			>> ${DESTDIR}/etc/fstab
 	fi
 	metalog_add_data ./etc/fstab
 
 	local hostname
 	hostname="$(echo $(uname -o) | tr '[:upper:]' '[:lower:]')"
 	echo "hostname=\"${hostname}\"" >> ${DESTDIR}/etc/rc.conf
 	metalog_add_data ./etc/rc.conf
 	if [ "${VMFS}" = zfs ]; then
 		echo "zfs_enable=\"YES\"" >> ${DESTDIR}/etc/rc.conf
 		echo "zpool_reguid=\"zroot\"" >> ${DESTDIR}/etc/rc.conf
 		echo "zpool_upgrade=\"zroot\"" >> ${DESTDIR}/etc/rc.conf
 		echo "kern.geom.label.disk_ident.enable=0" >> ${DESTDIR}/boot/loader.conf
 		echo "zfs_load=YES" >> ${DESTDIR}/boot/loader.conf
 		metalog_add_data ./boot/loader.conf
 	fi
 
 	return 0
 }
 
 vm_emulation_setup() {
 	if [ -n "${WITHOUT_QEMU}" ]; then
 		return 0
 	fi
 	if [ -n "${QEMUSTATIC}" ]; then
 		export EMULATOR=/qemu
 		cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR}
 	fi
 
 	mkdir -p ${DESTDIR}/dev
 	mount -t devfs devfs ${DESTDIR}/dev
 	chroot ${DESTDIR} ${EMULATOR} /bin/sh /etc/rc.d/ldconfig forcestart
 	cp /etc/resolv.conf ${DESTDIR}/etc/resolv.conf
 
 	return 0
 }
 
 vm_extra_install_base() {
 	# Prototype.  When overridden, runs extra post-installworld commands
 	# as needed, based on the target virtual machine image or cloud
 	# provider image target.
 
 	return 0
 }
 
 vm_extra_enable_services() {
 	if [ -n "${VM_RC_LIST}" ]; then
 		for _rcvar in ${VM_RC_LIST}; do
 			echo ${_rcvar}_enable="YES" >> ${DESTDIR}/etc/rc.conf
 		done
 	fi
 
 	if [ -z "${VMCONFIG}" -o -c "${VMCONFIG}" ]; then
 		echo 'ifconfig_DEFAULT="DHCP inet6 accept_rtadv"' >> \
 			${DESTDIR}/etc/rc.conf
 		# Expand the filesystem to fill the disk.
 		echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf
 	fi
 
 	return 0
 }
 
 vm_extra_install_packages() {
-	if [ -n "${WITHOUT_QEMU}" ]; then
-		return 0
-	fi
-
 	if [ -z "${VM_EXTRA_PACKAGES}" ]; then
 		return 0
 	fi
-	chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
-		/usr/sbin/pkg bootstrap -y
-	for p in ${VM_EXTRA_PACKAGES}; do
+	if [ -n "${NO_ROOT}" ]; then
+		for pkg in ${VM_EXTRA_PACKAGES}; do
+			INSTALL_AS_USER=yes \
+			${PKG_CMD} \
+			    -o METALOG=${DESTDIR}/METALOG.pkg \
+			    -o REPOS_DIR=${PKG_REPOS_DIR} \
+			    -o PKG_DBDIR=${DESTDIR}/var/db/pkg \
+			    -r ${DESTDIR} \
+			    install -y -r ${PKG_REPO_NAME} $pkg
+		done
+		metalog_add_data ./var/db/pkg/local.sqlite
+	else
+		if [ -n "${WITHOUT_QEMU}" ]; then
+			return 0
+		fi
+
 		chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
-			/usr/sbin/pkg install -y ${p}
-	done
+			/usr/sbin/pkg bootstrap -y
+		for p in ${VM_EXTRA_PACKAGES}; do
+			chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
+				/usr/sbin/pkg install -y ${p}
+		done
+	fi
 
 	return 0
 }
 
 vm_extra_install_ports() {
 	# Prototype.  When overridden, installs additional ports within the
 	# virtual machine environment.
 
 	return 0
 }
 
 vm_extra_pre_umount() {
 	# Prototype.  When overridden, performs additional tasks within the
 	# virtual machine environment prior to unmounting the filesystem.
 
 	return 0
 }
 
 vm_emulation_cleanup() {
 	if [ -n "${WITHOUT_QEMU}" ]; then
 		return 0
 	fi
 
 	if ! [ -z "${QEMUSTATIC}" ]; then
 		rm -f ${DESTDIR}/${EMULATOR}
 	fi
 	rm -f ${DESTDIR}/etc/resolv.conf
 	umount_loop ${DESTDIR}/dev
 	return 0
 }
 
 vm_extra_pkg_rmcache() {
 	if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then
 		chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
 			/usr/local/sbin/pkg clean -y -a
 	fi
 
 	return 0
 }
 
 buildfs() {
 	local md tmppool
 
+	if [ -f ${DESTDIR}/METALOG.pkg ]; then
+		cat ${DESTDIR}/METALOG.pkg >> ${DESTDIR}/METALOG
+	fi
+
 	case "${VMFS}" in
 	ufs)
 		cd ${DESTDIR} && ${MAKEFS} ${MAKEFSARGS} -o label=rootfs -o version=2 -o softupdates=1 \
 			${VMBASE} .${NO_ROOT:+/METALOG}
 		;;
 	zfs)
 		cd ${DESTDIR} && ${MAKEFS} -t zfs ${MAKEFSARGS} \
 			-o poolname=zroot -o bootfs=zroot/ROOT/default -o rootpath=/ \
 			-o fs=zroot\;mountpoint=none \
 			-o fs=zroot/ROOT\;mountpoint=none \
 			-o fs=zroot/ROOT/default\;mountpoint=/\;canmount=noauto \
 			-o fs=zroot/home\;mountpoint=/home \
 			-o fs=zroot/tmp\;mountpoint=/tmp\;exec=on\;setuid=off \
 			-o fs=zroot/usr\;mountpoint=/usr\;canmount=off \
 			-o fs=zroot/usr/ports\;setuid=off \
 			-o fs=zroot/usr/src \
 			-o fs=zroot/usr/obj \
 			-o fs=zroot/var\;mountpoint=/var\;canmount=off \
 			-o fs=zroot/var/audit\;setuid=off\;exec=off \
 			-o fs=zroot/var/crash\;setuid=off\;exec=off \
 			-o fs=zroot/var/log\;setuid=off\;exec=off \
 			-o fs=zroot/var/mail\;atime=on \
 			-o fs=zroot/var/tmp\;setuid=off \
 			${VMBASE} .${NO_ROOT:+/METALOG}
 		;;
 	*)
 		echo "Unexpected VMFS value '${VMFS}'"
 		exit 1
 		;;
 	esac
 }
 
 umount_loop() {
 	DIR=$1
 	i=0
 	sync
 	while ! umount ${DIR}; do
 		i=$(( $i + 1 ))
 		if [ $i -ge 10 ]; then
 			# This should never happen.  But, it has happened.
 			echo "Cannot umount(8) ${DIR}"
 			echo "Something has gone horribly wrong."
 			return 1
 		fi
 		sleep 1
 	done
 
 	return 0
 }
 
 vm_create_disk() {
 	local BOOTFILES BOOTPARTSOFFSET FSPARTTYPE X86GPTBOOTFILE
 
 	if [ -z "${NOSWAP}" ]; then
 		SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}"
 	fi
 
 	if [ -n "${VM_BOOTPARTSOFFSET}" ]; then
 		BOOTPARTSOFFSET=":${VM_BOOTPARTSOFFSET}"
 	fi
 
 	if [ -n "${CONFIG_DRIVE}" ]; then
 		CONFIG_DRIVE="-p freebsd/config-drive::${CONFIG_DRIVE_SIZE}"
 	fi
 
 	case "${VMFS}" in
 	ufs)
 		FSPARTTYPE=freebsd-ufs
 		X86GPTBOOTFILE=i386/gptboot/gptboot
 		;;
 	zfs)
 		FSPARTTYPE=freebsd-zfs
 		X86GPTBOOTFILE=i386/gptzfsboot/gptzfsboot
 		;;
 	*)
 		echo "Unexpected VMFS value '${VMFS}'"
 		return 1
 		;;
 	esac
 
 	echo "Creating image...  Please wait."
 	echo
 
 	BOOTFILES="$(env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		WITH_UNIFIED_OBJDIR=yes \
 		make -C ${WORLDDIR}/stand -V .OBJDIR)"
 	BOOTFILES="$(realpath ${BOOTFILES})"
 	MAKEFSARGS="-s ${VMSIZE} -D"
 
 	case "${TARGET}:${TARGET_ARCH}" in
 		amd64:amd64 | i386:i386)
 			ESP=yes
 			BOOTPARTS="-b ${BOOTFILES}/i386/pmbr/pmbr \
 				   -p freebsd-boot/bootfs:=${BOOTFILES}/${X86GPTBOOTFILE}${BOOTPARTSOFFSET}"
 			ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}"
 			MAKEFSARGS="$MAKEFSARGS -B little"
 			;;
 		arm:armv7 | arm64:aarch64 | riscv:riscv64*)
 			ESP=yes
 			BOOTPARTS=
 			ROOTFSPART="-p ${FSPARTTYPE}/rootfs:=${VMBASE}"
 			MAKEFSARGS="$MAKEFSARGS -B little"
 			;;
 		powerpc:powerpc*)
 			ESP=no
 			BOOTPARTS="-p prepboot:=${BOOTFILES}/powerpc/boot1.chrp/boot1.elf -a 1"
 			ROOTFSPART="-p freebsd:=${VMBASE}"
 			if [ ${TARGET_ARCH} = powerpc64le ]; then
 				MAKEFSARGS="$MAKEFSARGS -B little"
 			else
 				MAKEFSARGS="$MAKEFSARGS -B big"
 			fi
 			;;
 		*)
 			echo "vmimage.subr: unsupported target '${TARGET}:${TARGET_ARCH}'" >&2
 			exit 1
 			;;
 	esac
 
 	if [ ${ESP} = "yes" ]; then
 		# Create an ESP
 		espfilename=$(mktemp /tmp/efiboot.XXXXXX)
 		make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
 		BOOTPARTS="${BOOTPARTS} -p efi/efiboot0:=${espfilename}"
 
 		# Add this to fstab
 		mkdir -p ${DESTDIR}/boot/efi
 		echo "/dev/${ROOTLABEL}/efiboot0	/boot/efi       msdosfs     rw      2       2" \
 			>> ${DESTDIR}/etc/fstab
 	fi
 
 	# Add a marker file which indicates that this image has never
 	# been booted.  Some services run only upon the first boot.
 	touch ${DESTDIR}/firstboot
 	metalog_add_data ./firstboot
 
 	echo "Building filesystem...  Please wait."
 	buildfs
 
 	echo "Building final disk image...  Please wait."
 	${MKIMG} -s ${PARTSCHEME} -f ${VMFORMAT} \
 		${BOOTPARTS} \
 		${SWAPOPT} \
 		${CONFIG_DRIVE} \
 		${ROOTFSPART} \
 		-o ${VMIMAGE}
 
 	echo "Disk image ${VMIMAGE} created."
 
 	if [ ${ESP} = "yes" ]; then
 		rm ${espfilename}
 	fi
 
 	return 0
 }
 
 vm_extra_create_disk() {
 
 	return 0
 }
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index 36c14afe0bf1..05f80374926f 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -1,794 +1,807 @@
 .\" Copyright (c) 2002 Murray Stokely <murray@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 20, 2025
+.Dd September 11, 2025
 .Dt RELEASE 7
 .Os
 .Sh NAME
 .Nm release
 .Nd "release building infrastructure"
 .Sh DESCRIPTION
 .Fx
 provides a complete build environment suitable for users to make
 full releases of the
 .Fx
 operating system.
 All of the tools necessary to build a release are available from the
 .Fx
 source code repository in
 .Pa src/release .
 A complete release can be built with only a single command,
 including the creation of ISO images suitable for burning to CD-ROM,
 memory stick images, and a network install directory.
 This command is aptly named
 .Dq Li "make release" .
 .Pp
 For some users, it may be desirable to provide an absolutely clean
 build environment, with no local modifications to the source tree or to
 .Xr make.conf 5 ,
 and with clean checkouts of specific versions of the doc, src, and ports
 trees.
 For this purpose, a script
 .Pq Pa src/release/release.sh
 is provided to automate these checkouts and then execute
 .Dq Li "make release"
 in a clean
 .Xr chroot 8 .
 .Pp
 Before attempting to build a release, the user is expected to be
 familiar with the contents of
 .Xr build 7 ,
 and should have experience upgrading systems from source.
 .Pp
 The release build process requires that
 .Pa /usr/obj
 be populated with the output of
 .Dq Li "make buildworld"
 and
 .Dq Li "make buildkernel" .
 This is necessary to provide the object files for the release or, when
 using
 .Pa release.sh ,
 so that the object files for a complete system can be installed into a clean
 .Xr chroot 8
 environment.
 .Pp
 If the target release build is for a different architecture or machine type,
 the
 .Va TARGET
 and
 .Va TARGET_ARCH
 variables must be used.
 See the supported
 .Fa release.conf
 variables for more information.
 .Pp
 The release procedure on some architectures may also require that the
 .Xr md 4
 (memory disk) device driver be present in the kernel
 .Pq either by being compiled in or available as a module .
 .Pp
 This document does not cover source code management, quality
 assurance, or other aspects of the release engineering process.
 .Sh CLEAN RELEASE GENERATION
 Official releases of
 .Fx
 are produced in a clean environment to
 ensure consistency between the versions of the src, ports, and doc trees
 and to avoid contamination from the host system
 .Po such as local patches, changes
 to
 .Xr make.conf 5 ,
 etc.
 .Pc .
 This is accomplished using the wrapper script
 .Pa src/release/release.sh .
 .Pp
 .Ic release.sh
 .Op Fl c Ar release.conf
 .Pp
 .Ic release.sh
 checks out the
 .Li src/ ,
 .Li ports/ ,
 and
 .Li doc/
 trees to
 .Va CHROOTDIR ,
 then calls
 .Dq Li "make buildworld"
 and
 .Dq Li "make installworld"
 to generate a
 .Xr chroot 8
 environment.
 Next,
 .Dq Li "make release"
 is run within the
 .Xr chroot 8
 environment and places the result in
 .Pa $CHROOTDIR/R .
 .Pp
 The optional
 .Fa release.conf
 configuration file supports the following variables:
 .Bl -tag -width Ev
 .It Va CHROOTDIR
 The directory within which the release will be built.
 .It Va CHROOT_MAKEENV
 Additional
 .Xr make 1
 arguments to pass through, which directly affect the
 tuning of the build chroot.
 .It Va NOGIT
 Do not explicitly require the
 .Xr git 1
 port to be installed.
 .It Va GITROOT
 The
 .Xr git 1
 host used to check out the various trees.
 Defaults to
 .Pa https://git.FreeBSD.org .
 .It Va SRCBRANCH
 The
 .Li src/
 branch to use.
 Defaults to
 .Fl b Va main .
 .It Va PORTBRANCH
 The
 .Li ports/
 branch to use.
 Defaults to
 .Va head/@rHEAD .
 .It Va TARGET
 The target machine type for cross-building a release.
 .It Va TARGET_ARCH
 The target machine architecture for cross-building a release.
 .Pp
 For the supported list of
 .Va TARGET
 and
 .Va TARGET_ARCH
 combinations, consult the output of
 .Dq make targets
 as documented in
 .Xr build 7 .
 .It Va KERNEL
 The target kernel configuration to use.
 Defaults to
 .Va GENERIC .
 Multiple
 .Va KERNEL
 entries may be specified.
 .It Va MAKE_CONF
 The
 .Xr make.conf 5
 to use for the release build.
 Defaults to
 .Fa /dev/null
 to prevent polluting the release with local system changes.
 .It Va SRC_CONF
 The
 .Xr src.conf 5
 to use for the release build.
 Defaults to
 .Fa /dev/null
 to prevent polluting the release with local system changes.
 .It Va MAKE_FLAGS
 Additional flags to pass to
 .Xr make 1 .
 .It Va WORLD_FLAGS
 Additional flags to pass to
 .Xr make 1
 during the
 .Dq buildworld
 phase.
 Defaults to setting the number of
 .Xr make 1
 jobs
 .Pq Ar -j
 to the number of CPUs available on a SMP-capable system.
 .It Va KERNEL_FLAGS
 Additional flags to pass to
 .Xr make 1
 during the
 .Dq buildkernel
 phase.
 Defaults to setting the number of
 .Xr make 1
 jobs
 .Pq Ar -j
 to half the number of CPUs available on a SMP-capable system.
 .It Va NOPORTS
 Set to a non-empty value to skip the
 .Li ports/
 tree checkout.
 When set,
 .Va NOPORTS
 will prevent the
 .Fa ports.txz
 distribution package from being created.
 .It Va WITH_DVD
 Set to a non-empty value to include the
 .Cm dvdrom
 target.
 .It Va WITH_COMPRESSED_IMAGES
 Set to a non-empty value to compress the release images with
 .Xr xz 1 .
 The original
 .Pq uncompressed
 images are not removed.
 .It Va XZ_THREADS Pq Vt int
 Set to the number of threads
 .Xr xz 1
 should use when compressing images.
 By default,
 .Va XZ_THREADS
 is set to
 .Va 0 ,
 which uses all available cores on the system.
 .It Va VCSCMD
 The command run to obtain the source trees.
 Defaults to
 .Qq Cm git clone Fl q .
 .It Va CHROOTBUILD_SKIP
 If defined, the
 .Li buildworld ,
 .Li installworld ,
 and
 .Li distribution
 stages of the
 .Xr chroot 8
 build environment setup are skipped.
 This is intended solely for cases where the
 .Xr chroot 8
 userland are provided by alternate means.
 .It Va SRC_UPDATE_SKIP
 Set to a non-empty value to prevent checkout or update of
 .Fa /usr/src
 within the
 .Xr chroot 8 .
 This is intended for use only when
 .Fa /usr/src
 is expected to exist by alternative means.
 .It Va PORTS_UPDATE_SKIP
 Set to a non-empty value to prevent checkout or update of
 .Fa /usr/ports
 within the
 .Xr chroot 8 .
 This is intended for use only when
 .Fa /usr/ports
 is expected to exist by alternative means.
 .It Va PKGBASE
 Include base system packages for use with
 .Xr pkg 8
 on the install media, instead of legacy tarball distribution sets.
+.It Va PKG_CMD
+A path to the
+.Xr pkg 8
+executable to use when installing packages in release images as a non-root user.
+.It Va PKG_REPOS_DIR
+An optional path to a directory containing
+.Xr pkg 8
+repository configuration files.
+These configuration files will be used when installing packages in release
+images as a non-root user.
+.It Va PKG_REPO_NAME
+The name of the repository configuration to use when installing packages in
+release images as a non-root user.
 .El
 .Sh EMBEDDED BUILDS
 The following
 .Fa release.conf
 variables are relevant only to release builds for embedded systems:
 .Bl -tag -width Ev
 .It Va EMBEDDEDBUILD
 Set to a non-null value to enable functionality for embedded device
 release builds.
 .Pp
 When set,
 .Va WITH_DVD
 is unset.
 Additionally,
 .Va EMBEDDED_TARGET
 and
 .Va EMBEDDED_TARGET_ARCH
 must also be defined.
 When the build environment is created,
 .Fa release.sh
 runs a separate build script located in an architecture-specific
 directory in
 .Pa src/release/${EMBEDDED_TARGET}/ .
 .It Va EMBEDDEDPORTS
 Set to the list of any ports that are required for the target device
 in the format of
 .Fa category/port .
 .It Va EMBEDDED_TARGET
 When set, its value is passed to
 .Xr make 1
 to set the
 .Va TARGET
 .Pq value of Cm uname Fl m
 to cross build the target userland.
 .It Va EMBEDDED_TARGET_ARCH
 When set, its value is passed to
 .Xr make 1
 to set the
 .Va TARGET_ARCH
 .Pq value of Cm uname Fl p
 to cross build the target userland.
 .El
 .Sh VIRTUAL MACHINE DISK IMAGES
 The following
 .Fa release.conf
 variables are relevant only to virtual machine disk image builds:
 .Bl -tag -width Ev
 .It Va WITH_VMIMAGES
 Set to a non-null value to build virtual machine disk images as part
 of the release build.
 .Va WITH_VMIMAGES
 may also be specified as an environment variable passed to
 .Xr make 1 .
 .It Va WITH_COMPRESSED_VMIMAGES
 Set to a non-null value to compress the virtual machine disk images with
 .Xr xz 1
 as part of the
 .Cm install
 .Xr make 1
 target.
 Note that compressing virtual machine disk images may take a very long
 time on some systems.
 .It Va VMBASE
 Set to change the name of the resulting virtual machine disk image file.
 The default value is
 .Va vm .
 .It Va VMSIZE
 Set to change the size of the virtual machine disk capacity.
 The default value is
 .Va 20g .
 See
 .Xr makefs 8
 for valid values.
 .Pp
 Virtual machine disk images are, by default, created as sparse images.
 When
 .Va WITH_COMPRESSED_VMIMAGES
 is used, the resulting files compressed with
 .Xr xz 1
 compress to roughly the same size, regardless of the specified disk image
 size.
 .It Va VMFS
 (Deprecated.)
 Set to specify which of the filesystem(s) listed in
 .Va VMFSLIST
 is linked to the historical non-filesystem-labelled file name.
 Valid values are
 .Va ufs
 and
 .Va zfs .
 The default value is
 .Va ufs .
 .It Va VMFSLIST
 Set to specify the list of file system types to build images for.
 Valid values are one or both of
 .Va ufs
 and
 .Va zfs .
 The default value is
 .Va ufs zfs .
 .It Va VMFORMATS
 Set to the target virtual disk image format(s) to create.
 By default, the
 .Va vhdf , Va vmdk , Va qcow2 ,
 and
 .Va raw
 formats are created.
 See
 .Xr mkimg 1
 for valid format values.
 .El
 .Pp
 For a list of supported
 .Va VMFORMATS
 values
 .Pq including cloud hosting provider formats
 along with a brief description, run:
 .Bd -literal -offset indent
 cd /usr/src
 make -C release list-vmtargets
 .Ed
 .Sh CLOUD HOSTING MACHINE IMAGES
 The
 .Fx
 release build tools support building virtual machine images for various
 cloud hosting providers, each with their own specific configuration to
 include support for each hosting provider by default.
 .Pp
 The following
 .Xr make 1
 environment variables are supported:
 .Bl -tag -width Ev
 .It Va CLOUDWARE
 Set to a list of one or more cloud hosting providers, enclosed in quotes.
 Requires
 .Va WITH_CLOUDWARE
 to also be set.
 .It Va WITH_CLOUDWARE
 Set to a non-empty value to enable building virtual machine images
 for various cloud hosting providers.
 Requires
 .Va CLOUDWARE
 to also be set.
 .El
 .Pp
 Additionally, the
 .Va CLOUDWARE
 and
 .Va WITH_CLOUDWARE
 variables can be added to
 .Pa release.conf ,
 and used in conjunction with
 .Pa release.sh .
 .Pp
 For a list of supported
 .Va CLOUDWARE
 values, run:
 .Bd -literal -offset indent
 cd /usr/src
 make -C release list-cloudware
 .Ed
 .Sh OCI IMAGES
 The
 .Fx
 release build tools have experimental support for building
 Open Container Initiative (OCI) format container base images.
 This is enabled using a
 .Fa release.conf
 variable:
 .Bl -tag -width Ev
 .It Va WITH_OCIIMAGES
 Set to a non-null value to build OCI base images.
 .El
 .Sh MAKEFILE TARGETS
 The release makefile
 .Pq Pa src/release/Makefile
 is fairly abstruse.
 Most developers will only be concerned with the
 .Cm release
 and
 .Cm install
 targets.
 .\" XXX: Some sort of introduction to this list?  All the others have one.
 .Bl -tag -width ".Cm packagesystem"
 .It Cm release
 Meta-target to build all release media and distributions applicable to this
 platform.
 .It Cm install
 Copy all produced release media to
 .Pa ${DESTDIR} .
 .It Cm cdrom
 Builds installation CD-ROM images.
 This may require the
 .Xr md 4
 (memory disk) device driver be present in the kernel
 (either by being compiled in or available as a module).
 This target produces files called
 .Pa disc1.iso
 and
 .Pa bootonly.iso
 as its output.
 .It Cm dvdrom
 Builds installation DVD-ROM images.
 This may require the
 .Xr md 4
 (memory disk) device driver be present in the kernel
 (either by being compiled in or available as a module).
 This target produces the
 .Pa dvd1.iso
 file as its output.
 .It Cm memstick
 Builds an installation memory stick image named
 .Pa memstick.img .
 Not applicable on all platforms.
 Requires that the
 .Xr md 4
 .Pq memory disk
 device driver be present in the kernel
 .Pq either by being compiled in or available as a module .
 .It Cm mini-memstick
 Similar to
 .Cm memstick ,
 with the exception that the installation distribution sets
 are not included.
 .It Cm ftp
 Creates a directory named
 .Pa ftp
 containing the distribution files used in network installations
 and suitable for upload to an FTP mirror.
 .It Cm vm-image
 Creates virtual machine disk images in various formats.
 The
 .Cm vm-image
 target requires the
 .Va WITH_VMIMAGES
 .Xr make 1
 environment variable to be set to a non-null value.
 .It Cm vm-cloudware
 Builds
 .Fx
 virtual machine images for various cloud hosting providers.
 See
 .Qq CLOUD HOSTING MACHINE IMAGES
 for implementation details.
 .It Cm list-cloudware
 Displays the list of valid
 .Va CLOUDWARE
 values.
 .It Cm list-vmtargets
 Displays the list of valid
 .Va VMFORMATS
 and
 .Va CLOUDWARE
 values.
 .El
 .Pp
 Major subtargets called by targets above:
 .Bl -tag -width ".Cm packagesystem"
 .It Cm packagesystem
 Generates all the distribution archives
 .Pq base, kernel, ports, doc
 applicable on this platform.
 .It Cm disc1
 Builds a bootable installation system containing all the distribution files
 packaged by the
 .Cm packagesystem
 target, and suitable for imaging by the
 .Cm cdrom ,
 .Cm dvdrom
 and
 .Cm memstick
 targets.
 .It Cm reldoc
 Builds the release documentation.
 This includes the release notes,
 hardware guide, and installation instructions.
 Other documentation, such as the Handbook,
 is built during the
 .Cm base.txz
 target invoked by
 .Cm packagesystem .
 .El
 .Sh ENVIRONMENT
 Optional variables:
 .Bl -tag -width ".Ev TARGET_ARCH"
 .It Ev OSRELEASE
 Optional base name for generated media images when invoking the
 .Cm install
 target
 .Pq e.g., FreeBSD-12.1-RELEASE-amd64 .
 Defaults to the output of
 .Ic `uname -s`-`uname -r`-`uname -p`
 within the chroot.
 .It Ev WORLDDIR
 Location of a directory containing the src tree.
 By default, the directory
 above the one containing the makefile
 .Pq Pa src .
 .It Ev PORTSDIR
 Location of a directory containing the ports tree.
 By default,
 .Pa /usr/ports .
 If it is unset or cannot be found, ports will not be included in the release.
 .It Ev NOPORTS
 If defined, the Ports Collection will be omitted from the release.
 .It Ev NOSRC
 If set, do not include system source code in the release.
 .It Ev TARGET
 The target hardware platform.
 This is analogous to the
 .Dq Nm uname Fl m
 output.
 This is necessary to cross-build some target architectures.
 For example, cross-building for ARM64 machines requires
 .Ev TARGET_ARCH Ns = Ns Li aarch64
 and
 .Ev TARGET Ns = Ns Li arm64 .
 If not set,
 .Ev TARGET
 defaults to the current hardware platform.
 .It Ev TARGET_ARCH
 The target machine processor architecture.
 This is analogous to the
 .Dq Nm uname Fl p
 output.
 Set this to cross-build for a different architecture.
 If not set,
 .Ev TARGET_ARCH
 defaults to the current machine architecture, unless
 .Ev TARGET
 is also set, in which case it defaults to the appropriate
 value for that platform.
 Typically, one only needs to set
 .Ev TARGET .
 .El
 .Sh FILES
 .Bl -tag -compact -width Pa
 .It Pa /usr/doc/Makefile
 .It Pa /usr/doc/share/mk/doc.project.mk
 .It Pa /usr/ports/Mk/bsd.port.mk
 .It Pa /usr/ports/Mk/bsd.sites.mk
 .It Pa /usr/share/examples/etc/make.conf
 .It Pa /usr/src/Makefile
 .It Pa /usr/src/Makefile.inc1
 .It Pa /usr/src/release/Makefile
 .It Pa /usr/src/release/Makefile.vm
 .It Pa /usr/src/release/release.sh
 .It Pa /usr/src/release/release.conf.sample
 .It Pa /usr/src/release/tools/*.conf
 .It Pa /usr/src/release/tools/vmimage.subr
 .El
 .Sh EXAMPLES
 The following sequence of commands can be used to build a
 .Dq "-CURRENT snapshot":
 .Bd -literal -offset indent
 cd /usr
 git clone -b main https://git.freebsd.org/src.git src
 cd src
 make buildworld buildkernel
 cd release
 make obj
 make release
 make install DESTDIR=/var/freebsd-snapshot
 .Ed
 .Pp
 After running these commands, all produced distribution files (tarballs
 for FTP, CD-ROM images, etc.) are available in the
 .Pa /var/freebsd-snapshot
 directory.
 .Pp
 The following sequence of commands can be used to build a
 .Dq "-CURRENT snapshot"
 in a clean environment, including ports and documentation:
 .Bd -literal -offset indent
 cd /usr/src/release
 sh release.sh
 .Ed
 .Pp
 Optionally, a configuration file can be used to customize the release build:
 .Bd -literal -offset indent
 cd /usr/src/release
 sh release.sh -c $HOME/release.conf
 .Ed
 .Pp
 Configuration files specific to various supported embedded systems, such as
 the Raspberry Pi, exist in the directory corresponding to the
 .Va TARGET
 .Xr make 1
 variable.
 For example, to build an image for the Raspberry Pi:
 .Bd -literal -offset indent
 cd /usr/src/release
 sh release.sh -c arm/RPI-B.conf
 .Ed
 .Pp
 To build an image for the Raspberry Pi 3:
 .Bd -literal -offset indent
 cd /usr/src/release
 sh release.sh -c arm64/RPI3.conf
 .Ed
 .Pp
 After running these commands, all prepared release files are available in the
 .Pa /scratch
 directory.
 The target directory can be changed by specifying the
 .Va CHROOTDIR
 variable in
 .Li release.conf .
 .Sh COMPATIBILITY
 The reldoc target was removed in commit f61e92ca5a23, and
 .Ev DOCDIR ,
 .Ev DOCBRANCH ,
 .Ev DOC_UPDATE_SKIP ,
 and
 .Ev NODOC
 are therefore no longer supported.
 .Sh SEE ALSO
 .Xr cc 1 ,
 .Xr git 1 Pq Pa ports/devel/git ,
 .Xr install 1 ,
 .Xr make 1 ,
 .Xr mkimg 1 ,
 .Xr uname 1 ,
 .Xr md 4 ,
 .Xr make.conf 5 ,
 .Xr build 7 ,
 .Xr ports 7 ,
 .Xr chroot 8 ,
 .Xr mtree 8 ,
 .Xr sysctl 8
 .Rs
 .%T "FreeBSD Release Engineering"
 .%U https://docs.freebsd.org/en/articles/freebsd-releng/
 .Re
 .Rs
 .%T "FreeBSD Developers' Handbook"
 .%U https://docs.freebsd.org/en/books/developers-handbook/
 .Re
 .Sh HISTORY
 .Fx
 1.x
 used a manual checklist, compiled by
 .An Rod Grimes ,
 to produce a release.
 Apart from being incomplete, the list put a lot of specific demands on
 available file systems and was quite torturous to execute.
 .Pp
 As part of the
 .Fx 2.0
 release engineering effort, significant
 effort was spent getting
 .Pa src/release/Makefile
 into a shape where it could at least automate most of the tediousness
 of building a release in a sterile environment.
 .Pp
 For the
 .Fx 9.0
 release,
 .Pa src/release/Makefile
 was overhauled and the wrapper script
 .Pa src/release/generate-release.sh
 introduced to support the introduction of a new installer.
 .Pp
 For the
 .Fx 9.2
 release,
 .Pa src/release/release.sh
 was introduced to support per-build configuration files.
 .Pa src/release/release.sh
 is heavily based on the
 .Pa src/release/generate-release.sh
 script.
 .Pp
 At near 1000 revisions spread over multiple branches, the
 .Xr git 1
 log of
 .Pa src/release/Makefile
 contains a vivid historical record of some
 of the hardships release engineers go through.
 .Sh AUTHORS
 .Pa src/release/Makefile
 was originally written by
 .An -nosplit
 .An Rod Grimes ,
 .An Jordan Hubbard ,
 and
 .An Poul-Henning Kamp .
 .Pp
 This manual page was originally written by
 .An Murray Stokely Aq Mt murray@FreeBSD.org .
 .Pp
 It was updated by
 .An Nathan Whitehorn Aq Mt nwhitehorn@FreeBSD.org
 to include the
 .Fa generate-release.sh
 script used for the
 .Fx 9.0
 release cycle.
 .Pp
 It was later updated by
 .An Glen Barber Aq Mt gjb@FreeBSD.org
 to include the
 .Fa release.sh
 script used for the
 .Fx 9.2
 release cycle.