D47407.id145912.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D47407.id145912.diff
View Options

	diff --git a/release/Makefile b/release/Makefile
	--- a/release/Makefile
	+++ b/release/Makefile
	@@ -68,6 +68,15 @@
	.endfor
	.endif

	+# For installing packages into the release media.
	+.if defined(NO_ROOT)
	+PKGCMD= env INSTALL_AS_USER=y pkg -o METALOG=${.TARGET}/METALOG \
	+ -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos -c
	+.else
	+PKGCMD= pkg \
	+ -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos
	+.endif
	+
	.if !defined(VOLUME_LABEL) \|\| empty(VOLUME_LABEL)
	VOLUME_LABEL= FreeBSD_Install
	.endif
	@@ -167,6 +176,8 @@
	MK_RESCUE=no MK_DICT=no \
	MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
	-DDB_FROM_SRC )
	+# Install packages onto release media.
	+ ${PKGCMD} install -y wifi-firmware-kmod-release
	# Copy distfiles
	mkdir -p ${.TARGET}/usr/freebsd-dist
	for dist in MANIFEST $$(ls *.txz \| grep -vE -- '(${base ${_ALL_libcompats}:L:ts\|})-dbg'); \
	@@ -239,6 +250,8 @@
	DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
	MK_TESTS=no MK_DEBUG_FILES=no \
	-DDB_FROM_SRC )
	+# Install packages onto release media.
	+ ${PKGCMD} install -y wifi-firmware-kmod-release
	# Copy distfiles
	mkdir -p ${.TARGET}/usr/freebsd-dist
	for dist in MANIFEST $$(ls *.txz \| grep -v -- '(${base ${_ALL_libcompats}:L:ts\|})-dbg'); \