From nobody Thu Nov 21 23:26:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XvZ9w6h58z5dklk; Thu, 21 Nov 2024 23:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XvZ9w5zLbz4RGB; Thu, 21 Nov 2024 23:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732231588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvqeWU4eSLJVDrV8WREt4XJWdxjqmP7jIqhk3k45dDk=; b=GPS62GaHpEG/MvYVe0TAlSVaN3g1v+uwlFwYuzlLa+dg1zfAuZ9gTtF27gtsT8n/WDSDP2 M96MCXJnusegMb0ae+id9IydJRTnctNJ9Z82XYFsIS2jUxvIilUdDQ/pFF84842StHusU6 ku4K3t3MK164H4KrPOK8s+8ZoXiGgQcr54o5N9NCzpOx+zHSIoiZzR8fJ5jw4m+RpkfZ7R YA4V6RUu8Plwb5rsnrX0hhLTXiInDXdnF26pjY8Be49PNE46J+0xWUSiRe2M/S6zQ1+T7B SBCgF8vacJWCYMKY9gFh6er3IDYzw4vJhziBvOVjqij0YL7RNruLtJFgNZtkDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732231588; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NvqeWU4eSLJVDrV8WREt4XJWdxjqmP7jIqhk3k45dDk=; b=Vls+MQbXMu4gnQLOKnnXkB2gw5/yR3nvBX2vI9UXT2Fl2j5cHEvKFGvl2rVnbbJ8bQMYCb W8rg5sKuuxvhsK+NYyGSoB2b4iXeFYvL/tXE+qD4enjOMagwBPbi+gDjxI/EFKuR6yZOBA o8CUQPs0dWiwsgF5A20aSTWe50BW69btk2whxJfjt76hJkUGhQaIxUtyrKNGoXOiU8bag7 ahbg1rihoziyaOFKxzaZqvusaVwtKyFoJAzUzSzkTCMUKpqAFvriXPjOuZNBtqtLchZ1py Il+oUj+vicN1tZkD4f162vKz0roJgvo2vvieEZJY6aVT8CBYN0n4Ol5VVFteaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732231588; a=rsa-sha256; cv=none; b=f9j2Q8Xo8tJLmXA9FNmdk25+42zsoCnL5diMRnJGC0jJj2J9u5hzrrlh9sD0FOpJQoahIX VzXTsub+rLiiR11jP24jC19Iu4+4ctD+6GDOeSsnbzJ2kZVMMgf70ILSA9gSWx+JD/1IX8 LAo3WKgNzsUvo5XVbOlvT0b8+x+8R59YvrpsbYgPzFc67ePBwmigBdFk/haa02ubKknxkQ uwjgTEhwtsRKFhapsIYadtjLfRCTeTTNpRBud7JSA8eEffts6HtYFH43Nb9i4eCxgch4M8 CaTHqEa/3wpqQDd8Ns4NBbprdOaQyin2/j8UC9qEqfkE0//ly0YG940vsnVMrQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XvZ9w4qmMz10bD; Thu, 21 Nov 2024 23:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ALNQSot021475; Thu, 21 Nov 2024 23:26:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ALNQS5v021472; Thu, 21 Nov 2024 23:26:28 GMT (envelope-from git) Date: Thu, 21 Nov 2024 23:26:28 GMT Message-Id: <202411212326.4ALNQS5v021472@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 42d33f929925 - releng/14.2 - release: Don't break if firmware install fails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: 42d33f92992591cd86f66cc3fbc78e30b7f943fa Auto-Submitted: auto-generated The branch releng/14.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=42d33f92992591cd86f66cc3fbc78e30b7f943fa commit 42d33f92992591cd86f66cc3fbc78e30b7f943fa Author: Colin Percival AuthorDate: 2024-11-21 06:10:28 +0000 Commit: Bjoern A. Zeeb 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