From nobody Thu Nov 21 06:13:29 2024 X-Original-To: dev-commits-src-main@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 4Xv7G15H7Nz5fJDL; Thu, 21 Nov 2024 06:13:29 +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 4Xv7G14Sz3z4ssn; Thu, 21 Nov 2024 06:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732169609; 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=7ew20UI75RZbWs7R84D/uSIAOxr2X77AH4MS3zcM820=; b=r8DdsSBcOIkw7oxyb5Lj78sEZWlEjkUfTwjkd4Yj2prPPls9v7QXBfDQwCRNioiGUds6vS LjdObRTSNhf7zvS9i84BcuCOteCupBtMQIG9W0KoU/MOd6/9yVaclXGMk9anY++JsBd9A9 MwltCKBOSG3K3ux5sbj4adtEFxSVBczKDQD/CiVbLAu6809g8pCSYiX6BxzwSjdPZwPsN+ YFNHLlZ23qE2ddFhqOHqHZuculyPw+esBeOJ0jpCC66QWfvfPJK9cgdgKjX5LtaxJs01k9 wO2s5i5hv9alve3P+lCZJHYXgqjFxmCcbNKsyuDGZQ3YJaTVgnIMsFvlZ71L9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732169609; 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=7ew20UI75RZbWs7R84D/uSIAOxr2X77AH4MS3zcM820=; b=Oyf+T2t7LNhAvibzNkghBb49zFDbmKJHdW7IEnO66YzKE63Im+Cl4coYcWD4Q2DzRfXmIp q9kQm8ejnOV5ZJ9Eu7pAHcmJwFN8I8xiOqngW9Z+RCoR2C/PtA5FK/UtZ7up47+iGPq7sX Wie1xvzJo/oAe2Tm66RnPI76oUzdoOk+GUC1ytVGYFmxlL577vZ2kpVOGY3aY73fbxGk0w JdUOXU6z+mBn/cm1wowRNJEWzdwH0JMD1QI3vkYZ4weNLqfeheFH7/VaCa09q1H2rqPTp3 xl/aEY/Lj1NRx+KtE3X99DOPDou1g66F3Rfs44hjg8Ccxc2pVFelkTE/keRpgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732169609; a=rsa-sha256; cv=none; b=Iac6Ot+5ruoJhILICn6p308uCjsKh2D0oWU2HXSHCa71hCe/G3pt6C6AV/uqsUw74rYMaV a1nOYNIbXHcmP42rPvf5xekKGT/wMUvBh7CLq2QTwY3n9ASxLGv9ni/kL8K/gqmxo3V9n+ fLrST3+Vjooo/ZV6o85G2AivY2ALG4oNN+PbVSVkcHP+G64++P/Ey6klm0EZOwW86MVwa3 MmBaKBsz+ueJ0EpOSJVb3LQOekhxvvAXg6dAv/X+v2XNEAySqlgsA8QfQoielW2NM5eOCK U1AYW3+YKiKhydnPBGBBY3GlyO3QOF/NM+olPWEKMMy8Sm53l92UQ6+3Rhb3cQ== 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 4Xv7G144XSzS9K; Thu, 21 Nov 2024 06:13:29 +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 4AL6DT4x076663; Thu, 21 Nov 2024 06:13:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AL6DTB1076660; Thu, 21 Nov 2024 06:13:29 GMT (envelope-from git) Date: Thu, 21 Nov 2024 06:13:29 GMT Message-Id: <202411210613.4AL6DTB1076660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e8263ace39c8 - main - release: Don't break if firmware install fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e8263ace39c8ecf11233c0a10d0b1839e6813046 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e8263ace39c8ecf11233c0a10d0b1839e6813046 commit e8263ace39c8ecf11233c0a10d0b1839e6813046 Author: Colin Percival AuthorDate: 2024-11-21 06:10:28 +0000 Commit: Colin Percival CommitDate: 2024-11-21 06:13:24 +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 --- release/Makefile | 4 ++-- 1 file 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