git: 9e100a7f5631 - stable/15 - release: Fail the build if pkg can't be installed
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 25 Sep 2025 01:01:41 UTC
The branch stable/15 has been updated by ivy:
URL: https://cgit.FreeBSD.org/src/commit/?id=9e100a7f5631a7c20f17ca41c3343848e6f6ffbf
commit 9e100a7f5631a7c20f17ca41c3343848e6f6ffbf
Author: Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-09-23 22:17:46 +0000
Commit: Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-09-25 01:00:41 +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
(cherry picked from commit 8654315ae8d368ce47232bde1f2593e256224e56)
---
release/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/release/Makefile b/release/Makefile
index 35eae4083d14..13aaefd4db8d 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
@@ -278,7 +278,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
@@ -331,7 +331,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