diff --git a/release/Makefile b/release/Makefile --- a/release/Makefile +++ b/release/Makefile @@ -238,7 +238,14 @@ .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. + + # If we're building pkgbase media, take the pkg package from the pkgbase + # repository we already created. +.if !defined(NOPKGBASE) || empty(NOPKGBASE) + env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} -R ${.OBJDIR}/pkgbase-repo-conf install -f pkg +.else ${PKG_INSTALL} pkg +.endif ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif @@ -279,7 +286,14 @@ .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. +# + # If we're building pkgbase media, take the pkg package from the pkgbase + # repository we already created. +.if !defined(NOPKGBASE) || empty(NOPKGBASE) + env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} -R ${.OBJDIR}/pkgbase-repo-conf install -f pkg +.else ${PKG_INSTALL} pkg +.endif ${PKG_INSTALL} wifi-firmware-iwlwifi-kmod wifi-firmware-rtw88-kmod || true ${PKG_CLEAN} || true .endif @@ -333,7 +347,14 @@ .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. +# + # If we're building pkgbase media, take the pkg package from the pkgbase + # repository we already created. +.if !defined(NOPKGBASE) || empty(NOPKGBASE) + env ${PKG_ENV} ${PKG_CMD} ${PKG_ARGS} -R ${.OBJDIR}/pkgbase-repo-conf install -f pkg +.else ${PKG_INSTALL} pkg +.endif ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif