aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2024-11-21 06:10:28 +0000
committerColin Percival <cperciva@FreeBSD.org>2024-11-21 06:13:24 +0000
commite8263ace39c8ecf11233c0a10d0b1839e6813046 (patch)
tree165a1f65a38f196e0202e9ba602000cbd1b0148d
parent1f78bbb5c415efefa782c1be7f9a2e4a5008903b (diff)
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") MFC after: 1 minute
-rw-r--r--release/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile
index 9d5b64dae271..a99486ea4b84 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -193,7 +193,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
@@ -269,7 +269,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