From nobody Mon Jan 26 08:16:59 2026 X-Original-To: dev-commits-src-branches@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 4f01bb6MP3z6PvNg for ; Mon, 26 Jan 2026 08:16:59 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f01bb3DgWz45mJ for ; Mon, 26 Jan 2026 08:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769415419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6y36sdbKAieT2p0bSV9gIvFoIULCuXy3+55BWa3pSzc=; b=Q1gQK8zsdU/4S+5TsRvC6PYIqIluAutNf/z2cpaXutiWB0CYbkCQsrpjLgbX24K9rOxtNB EcucMm0fc7DaAuEuuKdl4Jcx8MAI56/4fpeUopbr9O12PS/oOwJKOtc+E3anq01TrxvAU9 SjLT3ITuBge7cxWoe6mD1ZSGnlCpFai6Y/pkERav1R8avNB8B7qpSipXlcm1LwGceSR21A urnSWbuvabenYGZjGbAaSo9HorF56i6WOi1jPZGIet6MqJ1sr9IXKam6YEUOdj1zp6zd0O bbu6yOBaYLZr91mREcQ1NizvAZrzfDIRyRvrwnkFcGzt6h8x5LYtY4Pfl5mscA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769415419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6y36sdbKAieT2p0bSV9gIvFoIULCuXy3+55BWa3pSzc=; b=b/Nn/qcmeiwA7cE9Jbbd+n1DpV9loL77WAXYKfNNeYl2OIWXN71Ob2RQ83Tlr8aESaH4Go 9BddY+f8hYtJJK4YVm0GwqD66cYlb+mqBiu2fjiA5IcNYdlPnhHUEPccKJU92DPhmvp+EY 6bWQB+zebV9rkUCDZDDNfmEGX9WYspEj7SNA/mu1vGWHWyYgy76XcxwyD57Vd7xDH4hs7K GP7/lOD0vbtldDTZuuGYrO4oXg5SX1a0PGauqKugIz/EVfdtb8wQKKGvMaa4udIbn7VVQg NfNHCTd1ekhk2b5TOGkMJozdOZyinRadpDmDo+jy4o3Qm8NpKWcUfrK2Uif8rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769415419; a=rsa-sha256; cv=none; b=GkrzFrkLtOrPZg3cz4zWJl1MhxKzNXVp5MFbNWksNSqd1T2tAhN6A16WgSCDvZtAuXqE3F xBBJFn0AAv0JNSBIWZtGMpk9ME8FZ+b7s7mlljCkFQLLV/bbDa0Sh045pCWapZBq09bPir IGi2Dvu1bZOE4cmJROedwl3s+VHlU40Wy/x6Bk1JEXC1t/Z8XD2K+ikRp3FZgKdM9v5rkW W6ZSyLyZcoActwvLNgwqNyL73lLjDWdJgc30j6LEEQbWb5WwOSQx4G1Q3JOUplXHZrWmsW FXGOEnHOvmsDSN6Qt+6G7UL4OpBvRG4mUOydMMYyLivrVbXFc/TxKZwpuWj5ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f01bb1x03z1C0Q for ; Mon, 26 Jan 2026 08:16:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 231ea by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 08:16:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Bjoern A. Zeeb From: Zhenlei Huang Subject: git: e09f36c741bd - stable/15 - modules: iwlwifi/rtw89 allow standalone build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e09f36c741bd4866c2fef36040eaf87d6f1c84bf Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 08:16:59 +0000 Message-Id: <697722fb.231ea.47f15250@gitrepo.freebsd.org> The branch stable/15 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e09f36c741bd4866c2fef36040eaf87d6f1c84bf commit e09f36c741bd4866c2fef36040eaf87d6f1c84bf Author: Bjoern A. Zeeb AuthorDate: 2026-01-18 21:45:40 +0000 Commit: Zhenlei Huang CommitDate: 2026-01-26 08:15:11 +0000 modules: iwlwifi/rtw89 allow standalone build The KERN_OPTS:MDEV_ACPI checks are fine for as long as we are building modules along the kernel. If one wants to just build the module standalone out of the module directory this would fail. Add the missing include for kmod.opts.mk (as was done for tcp in 1319a76179682). Sponsored by: The FreeBSD Foundation Reported by: Tassilo Philipp (tphilipp potion-studios.com) Fixes: f5a77dc8f8df ("improve module Makefile dependency on ACPI") Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54769 (cherry picked from commit 0f0b833e4db6d450b39de0365b657936f5a6993b) --- sys/modules/iwlwifi/Makefile | 2 ++ sys/modules/rtw89/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 1d0c52276b84..94b25c261acc 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -1,3 +1,5 @@ +.include + DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 98174fff2a1b..9aa6cfda1d3d 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -1,3 +1,5 @@ +.include + DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 .PATH: ${DEVRTW89DIR}