From nobody Wed Sep 24 09:16:51 2025 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 4cWrnw1bQPz68mq7; Wed, 24 Sep 2025 09:16:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cWrnw02kgz3wmJ; Wed, 24 Sep 2025 09:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758705412; 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=aKSJExtfpbLDvlHL7okf5IK0MHkxzUiNhDuHByvykek=; b=s6KJPpcD95F5kYWYRl69F/pcOaJNsBzBC+SkGAiPvHWkPpPsuMyQhy26dLzb2eWa1CY4c0 70396SuP2Locot3jTwD4oUlOJof/Mn3K7IHW6UsrDVC9l2a9DZHrzrF8aDMDysi/Au3kPr qfJqA0KIPwZtO7b/G2a+J2odeB/+8F2MKNvzPdRFBPToDzx1RJ1l8LQMFjO72OEULG/rrr /t1zhix0yPPuuNLVjUMJ7X/B53BpXceCdImxlhKVk7SNhMoKnGNwM3eOMG2MD8YIUG/Hai GMSVuLfwsdIkBOyn/RAuaoDZHfT4h/Bu3/KM+JCuR9+fhDGrlBi4bMQMK3UN5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758705412; 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=aKSJExtfpbLDvlHL7okf5IK0MHkxzUiNhDuHByvykek=; b=j2f0Dwf8JufuqvSywa7aWL5z8402Q96oD66Ja+VbWnjziGpSJCDh02bwGdGo6waI7DfYcy DN2BjhEqHT0s5Vns/cYbrla7PkWQTbCVKJseYki+Ijc/1fX0KjZRtI2xCj/pEZwDcVO5h8 UYIBFywGANj6th6pZtQcGk+e02U/3Cccq+e9fNQK8VIwVadfXYGJIknam3RcXP4wbP4qEg d7hFKCFSdER0Qtl0AiCFrOnRtA7HcJ6q//7UOyQ+F2G6jUUCyYdubGegdscCtYcDK1Gc9h DkvqzP+aFyr6Z9y45bRsYsWqkkAn1T1o5maIXel6dM3QDpNWrfHwcYp2B4SkQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758705412; a=rsa-sha256; cv=none; b=bDB2xc0E1APmTK8ViytceX11Zkmpt8+6o8hi1oFH1l2Fi4cqMwmPU75XEJUwqCIiSE76lA atWCLXoUZzF0vStjOwP+oujZ1IODpY+wCzG46Bp4R9d1gtaAnH94IOeiklowJ9DFq0hEpF bljI6V+p8caFk4XVo2/cEi+wOrSXbqJ8gs0wnjlnEqAJZUJpDb/5JLUYHElxDMzmEyOy4p TPSuUGvcJVYTbMRs03HaHOw8DcTlalQ8ylgFTov5Jgcz61Re9nLeip9+OubF3JClAIcTnY Ep2na/8jWiNbf7bIlDwE7xItY2mp3Ln0ibu5JjNF3HOwaNh/dvTuUEIWJvQKLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cWrnv6lwvz9cw; Wed, 24 Sep 2025 09:16:51 +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 58O9Gpds001622; Wed, 24 Sep 2025 09:16:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58O9GpLb001619; Wed, 24 Sep 2025 09:16:51 GMT (envelope-from git) Date: Wed, 24 Sep 2025 09:16:51 GMT Message-Id: <202509240916.58O9GpLb001619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 8654315ae8d3 - main - release: Fail the build if pkg can't be installed 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8654315ae8d368ce47232bde1f2593e256224e56 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=8654315ae8d368ce47232bde1f2593e256224e56 commit 8654315ae8d368ce47232bde1f2593e256224e56 Author: Lexi Winter AuthorDate: 2025-09-23 22:17:46 +0000 Commit: Lexi Winter CommitDate: 2025-09-24 09:16:13 +0000 release: Fail the build if pkg can't be installed If we can't install pkg(8) on the media, instead of ignoring the error, fail the build. This avoids silently creating media which doesn't have pkg(8) on, and therefore can't be used for a pkgbase install. Installing pkg(8) can still be entirely disabled by setting NOPKG. MFC after: 1 day Reviewed by: ifreund_freebsdfoundation.org, cperciva Differential Revision: https://reviews.freebsd.org/D52635 --- release/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index b4da9c68eca1..296ce83f6dac 100644 --- a/release/Makefile +++ b/release/Makefile @@ -238,7 +238,7 @@ disc1: ${PKGBASE_REPO} .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. - ${PKG_INSTALL} pkg || true + ${PKG_INSTALL} pkg ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif @@ -279,7 +279,7 @@ bootonly: .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. - ${PKG_INSTALL} pkg || true + ${PKG_INSTALL} pkg ${PKG_INSTALL} wifi-firmware-iwlwifi-kmod wifi-firmware-rtw88-kmod || true ${PKG_CLEAN} || true .endif @@ -333,7 +333,7 @@ dvd: ${PKGBASE_REPO} .endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. - ${PKG_INSTALL} pkg || true + ${PKG_INSTALL} pkg ${PKG_INSTALL} wifi-firmware-kmod-release || true ${PKG_CLEAN} || true .endif