diff --git a/release/Makefile b/release/Makefile --- a/release/Makefile +++ b/release/Makefile @@ -68,6 +68,17 @@ .endfor .endif +.if ${.MAKE.OS} == "FreeBSD" +# For installing packages into the release media. +.if defined(NO_ROOT) +PKGCMD= env ASSUME_ALWAYS_YES=yes INSTALL_AS_USER=yes pkg \ + -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos -o METALOG=METALOG +.else +PKGCMD= env ASSUME_ALWAYS_YES=yes pkg \ + -r ${.TARGET} -o REPOS_DIR=${.CURDIR}/pkg_repos +.endif +.endif + .if !defined(VOLUME_LABEL) || empty(VOLUME_LABEL) VOLUME_LABEL= FreeBSD_Install .endif @@ -178,6 +189,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. + ${PKGCMD} 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 @@ -250,6 +265,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. + ${PKGCMD} 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 @@ -299,13 +318,17 @@ touch ${.TARGET} pkg-stage: dvd -# TODO: Support for -DNO_ROOT .if !defined(NOPKG) || empty(NOPKG) +.if defined(NO_ROOT) +# TODO: Support for -DNO_ROOT + echo "${.TARGET}: NO_ROOT NOT SUPPORTED. SKIPPING." +.else env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ sh ${.CURDIR}/scripts/pkg-stage.sh mkdir -p ${.OBJDIR}/dvd/packages/repos/ cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \ ${.OBJDIR}/dvd/packages/repos/ +.endif .endif touch ${.TARGET}