From nobody Thu Sep 25 01:01:41 2025 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 4cXFm6394Cz68k3B; Thu, 25 Sep 2025 01:01:42 +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 4cXFm54qlwz3bKh; Thu, 25 Sep 2025 01:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762101; 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=/8NtUy9lxSdRrnjE8v8/s0griAvrAqZ8TD6iS9FYKn4=; b=tpgitbz2ljIknmkXyrZ8KeBhGbUAO0BvtQueWAPROxKVcN6E1khpXAwC3fOjC9Zy5L3D68 F4rK/gogv1+EUqUHxbpdNJB6tnEI+bzXIxLPgjSViJzdRJOYZIkHniqmjGKuR/yonVkbpx Qfd/WPo6/2Ldc3Kn8vTZ+wWpMSntDg04ewjWJBZxeSXvkVAkUDRvvViUWzDaZP3pNsrzcb U+/zsja06dk2BVA/yW/frVaqj3fYdnrW+X0UJelDJfwQ92ZhqyFxAUsJsEuQ8e8VIQBhHK 112N5HqmbHuRd1FYYHTO6UzrFSAaV1en9IQHW6iovKJtPNSgIIKwBbFBtrCzsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758762101; 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=/8NtUy9lxSdRrnjE8v8/s0griAvrAqZ8TD6iS9FYKn4=; b=PSnUjxpWdEaawTXfLm0oDJOSRVvoFnKi0FCFD8vXE/UeI+e6D3JXQfoQ5fReenXQjcLUxu rYe6qJ/pbTXpUQCxC6rAz3gxXOBLZSE0FfgoWdK3Vf7cZcBarUvFhlrLXyqysApVbdm6nK iytPce8zeutUnZ7QRG8vQzY2zht4cBADToRWrHv4iSyhZflp+QnmmIpgxCHSSy3OKKCvDY 4zeMSWnsq9xjn8soPp9hvr3uLsbFRlsuPTgYLSVBVWz+EQEq965O18BEj9qDpzTTtB7Snu p1eEzQc9WtT41H2w4aorFm9HXgb95ehbq39W+G5zY1OI4+C0uRE5CGr4UMNmBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758762101; a=rsa-sha256; cv=none; b=MAo6buEXK+6XhWcDaFyuzVEJW6t6dTc7KMeOCWdo26GMc3TjbffeUrznzx9bSE6htz5cLJ xAWIMvH9x6dGlmH2tfTLEDCC7cK2OVp9coKXTAVWp5ATnGufQtbRsERuvS0YzG0lY5xS3h QmoaKhxkrcnJ3qNCufAl/ay7Ed5d42wwrJnoojCOPYUGaK2kr803rsF0/0oIMRTI/6Ma4n HkGRqEM21j7brs/XkZKFZrRFQ7xKXvfM6PtXIIJ+C58yeOtzLbX/gnNLujzxQs+ACeylOm jzAWrVDmsDbLtJJjSeC7Qf7qCdS84in2NIkfLQdi6BbxQqNBNVg2sHwX+RkZ1w== 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 4cXFm54LQfzw4c; Thu, 25 Sep 2025 01:01:41 +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 58P11fUB086960; Thu, 25 Sep 2025 01:01:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P11fLJ086957; Thu, 25 Sep 2025 01:01:41 GMT (envelope-from git) Date: Thu, 25 Sep 2025 01:01:41 GMT Message-Id: <202509250101.58P11fLJ086957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 9e100a7f5631 - stable/15 - release: Fail the build if pkg can't be installed 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9e100a7f5631a7c20f17ca41c3343848e6f6ffbf Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=9e100a7f5631a7c20f17ca41c3343848e6f6ffbf commit 9e100a7f5631a7c20f17ca41c3343848e6f6ffbf Author: Lexi Winter AuthorDate: 2025-09-23 22:17:46 +0000 Commit: Lexi Winter CommitDate: 2025-09-25 01:00:41 +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 (cherry picked from commit 8654315ae8d368ce47232bde1f2593e256224e56) --- release/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 35eae4083d14..13aaefd4db8d 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 @@ -278,7 +278,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 @@ -331,7 +331,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