git: 8654315ae8d3 - main - release: Fail the build if pkg can't be installed
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 24 Sep 2025 09:16:51 UTC
The branch main has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=8654315ae8d368ce47232bde1f2593e256224e56
commit 8654315ae8d368ce47232bde1f2593e256224e56
Author: Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-09-23 22:17:46 +0000
Commit: Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-09-24 09:16:13 +0000
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
---
release/Makefile | 6 +++---
1 file 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