Page MenuHomeFreeBSD
Files F107287602

D47407.diff
No OneTemporary
Actions

D47407.diff
View Options

diff --git a/release/Makefile b/release/Makefile
--- a/release/Makefile
+++ b/release/Makefile
@@ -70,6 +70,17 @@
.endfor
.endif
+.if ${.MAKE.OS} == "FreeBSD"
+# For installing packages into the release media.
+.if defined(NO_ROOT)
+PKG_ENV+= INSTALL_AS_USER=yes
+PKG_ARGS+= -o METALOG=METALOG
+.endif
+PKG_ENV+= ASSUME_ALWAYS_YES=yes
+PKG_ARGS+= -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos
+PKG_INSTALL= env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} install
+.endif
+
.if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL)
VOLUME_LABEL= FreeBSD_Install
.endif
@@ -180,6 +191,10 @@
do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
done
.endif
+.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
+# Install packages onto release media.
+ ${PKG_INSTALL} wifi-firmware-kmod-release
+.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -252,6 +267,10 @@
do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \
done
.endif
+.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
+# Install packages onto release media.
+ ${PKG_INSTALL} wifi-firmware-kmod-release
+.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 13, 12:48 AM (20 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14753170
Default Alt Text
D47407.diff (1 KB)

Event Timeline