upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

release: Don't break if firmware install fails

Browse source 
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 9431091ee0)
This commit is contained in:
Colin Percival 2024-11-20 22:10:28 -08:00 committed by Bjoern A. Zeeb
parent c5b8ed13c9
commit 42d33f9299
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
release/Makefile
View file

@ -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