git: 42d33f929925 - releng/14.2 - release: Don't break if firmware install fails
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Nov 2024 23:26:28 UTC
The branch releng/14.2 has been updated by bz:
URL: https://cgit.FreeBSD.org/src/commit/?id=42d33f92992591cd86f66cc3fbc78e30b7f943fa
commit 42d33f92992591cd86f66cc3fbc78e30b7f943fa
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-11-21 06:10:28 +0000
Commit: Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-11-21 23:24:58 +0000
release: Don't break if firmware install fails
On some platforms (e.g. powerpc) we don't have packages, so we can't
install them onto the ISOs. Proceed with building the images anyway.
Reported by: Weekly snapshot builds
Fixes: 7e2996c1f5b4 ("release: install wireless firmware onto disc1 and dvd")
Approved by: re (cperciva)
(cherry picked from commit e8263ace39c8ecf11233c0a10d0b1839e6813046)
(cherry picked from commit 9431091ee021eca9eb4c768b566e623ba9333b41)
---
release/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/Makefile b/release/Makefile
index c5970b184b96..152c2edfcf06 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -199,7 +199,7 @@ disc1: packagesystem
.endif
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
# Install packages onto release media.
- ${PKG_INSTALL} wifi-firmware-kmod-release
+ ${PKG_INSTALL} wifi-firmware-kmod-release || true
.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
@@ -273,7 +273,7 @@ dvd: packagesystem
.endif
.if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG))
# Install packages onto release media.
- ${PKG_INSTALL} wifi-firmware-kmod-release
+ ${PKG_INSTALL} wifi-firmware-kmod-release || true
.endif
# Set up installation environment
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf