From nobody Thu Nov 21 06:13:54 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 4Xv7GV6zlmz5fJ0q; Thu, 21 Nov 2024 06:13:54 +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 4Xv7GV5y6fz4spk; Thu, 21 Nov 2024 06:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732169634; 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=JCrtbekWNX8JgvbSsmiDIG1QxemjWyuG9cgou76dW5Q=; b=VTSxqNvhpPNIvy/iQsUyIcGgFpk7JrcVhBH50T9O5L8ADf6FPF5EzXEO1UH7kYQbp+OVtN cT3lzbvWSWjBYetP5gPPlyycIuW2rWs4eURdweALKLP4LTBEAC22uJxmjBnjBRw17OaZjA rsMTs7+zSVnBf/cleu1H/0/dsw90liXsVFER2N3whMxvXSNT7ub8M6PTv/W+QfrIYpkfJO Tt/QOSWb4w5ujIdOsOewXdavK+kmDmJb49XurQwHl06bYHSByfbxQqU1I3rR3qTpNrbi5j XPcFozcWS8maTTcaXfqr/LXcpkeBQ8Th00FOuMGZ/vG/5xH6MyYxpAKtLLYFTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732169634; 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=JCrtbekWNX8JgvbSsmiDIG1QxemjWyuG9cgou76dW5Q=; b=oMN0UvzeekynrJ22pNvfzR5grGK6lWMaYwTeJRlrnk+M3kjpVLYk2GlZNYYP+F+gZXhdHS ghMASkqSnGqNr9PoS2a8E6MPP+ncIHOcj8T2wQSJoX6RwrJ7Q4pWTIvyHTXlmfRDr+1XVt rQxBzB2aEkvXROtYwSgTjifFuLYOwd+gTcmvYA1WbLreTH4WLGrW43BU7rd0ziU951C0Cy A4A3EAtq87XBSnBGwht7+VA0xHWeDk62XWgzsbq0pvjXufKgJNEm/tble19f/u6fCttU7k ym9Mik2r4XLEkztlNkqTb+sS9Wtv82LcKIU6iJGttTFqniLpzuvvdOvkFI5iHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732169634; a=rsa-sha256; cv=none; b=QaXDbZStOHxqXw1ylj6jf41QvDNc03fTwODTsjeqlS6wjdq+Zz81uWU6tjLmD8dnzsMl1l RiGSIn9WnbYSdZ6XOuVRM2Ff40MJL61OClSTutU4JCQaRurQDaSdjv5u9Cq7nYk5qSUH3v C8WZPbPcnujrTeVyxvI0fcx6v6HryUcRKt6U+K3v0F+Vqv9nwW2OyZpP3R2UjqMDZawhON bYYUsUOyKFmQvL6Q9pEhrEyiPe3LtYpswVvsiuiDjGIiT5Xi4xwDO83cFxl7catp76/ze8 H4SI3kilbKClfLCjDuFka2XZZpdg3N/xVwdgA/+7gKxyoYa8oYeuFG8ER212LA== 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 4Xv7GV5Z5bzS9L; Thu, 21 Nov 2024 06:13:54 +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 4AL6Ds0n076967; Thu, 21 Nov 2024 06:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AL6DsUf076964; Thu, 21 Nov 2024 06:13:54 GMT (envelope-from git) Date: Thu, 21 Nov 2024 06:13:54 GMT Message-Id: <202411210613.4AL6DsUf076964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 9431091ee021 - stable/14 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9431091ee021eca9eb4c768b566e623ba9333b41 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9431091ee021eca9eb4c768b566e623ba9333b41 commit 9431091ee021eca9eb4c768b566e623ba9333b41 Author: Colin Percival AuthorDate: 2024-11-21 06:10:28 +0000 Commit: Colin Percival CommitDate: 2024-11-21 06:13:44 +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") MFC after: 1 minute (cherry picked from commit e8263ace39c8ecf11233c0a10d0b1839e6813046) --- 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