diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-09-23 22:17:46 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-09-24 09:16:13 +0000 |
| commit | 8654315ae8d368ce47232bde1f2593e256224e56 (patch) | |
| tree | 91bb987d67136c22d545e08153e184489ca4f9c5 | |
| parent | f259daa708f507d3ff450d2eb8c05065674339ec (diff) | |
release: Fail the build if pkg can't be installed
If we can't install pkg(8) on the media, instead of ignoring the error,
fail the build. This avoids silently creating media which doesn't have
pkg(8) on, and therefore can't be used for a pkgbase install.
Installing pkg(8) can still be entirely disabled by setting NOPKG.
MFC after: 1 day
Reviewed by: ifreund_freebsdfoundation.org, cperciva
Differential Revision: https://reviews.freebsd.org/D52635
| -rw-r--r-- | release/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index b4da9c68eca1..296ce83f6dac 100644 --- a/release/Makefile +++ b/release/Makefile @@ -238,7 +238,7 @@ disc1: ${PKGBASE_REPO} .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. - ${PKG_INSTALL} pkg || true + ${PKG_INSTALL} pkg ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif @@ -279,7 +279,7 @@ bootonly: .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. - ${PKG_INSTALL} pkg || true + ${PKG_INSTALL} pkg ${PKG_INSTALL} wifi-firmware-iwlwifi-kmod wifi-firmware-rtw88-kmod || true ${PKG_CLEAN} || true .endif @@ -333,7 +333,7 @@ dvd: ${PKGBASE_REPO} .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. - ${PKG_INSTALL} pkg || true + ${PKG_INSTALL} pkg ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif |