From nobody Mon May 26 15:24:11 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 4b5fgb66Bnz5w9pc; Mon, 26 May 2025 15:24:11 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5fgb5HRDz40NZ; Mon, 26 May 2025 15:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273051; 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=yjSiXN7M4/DoQhjnm281CEQiCrrohJ5rluQQcIgbmgw=; b=nMgf/0FkTC8sjf+eYVF6p5FQN8BpnBRxZ/X+8ofTTJHFxHy9aTqjODfIsJsXyVjf/8Fwhk ViuajU0y1PK/Enf2BgL5FNHn1CYLP6Sx6BuxNfTQJK50GR4RY9j9QV+ciOY6vvf9faZHUA CqrgVeVTlZU53STn/xMmjxMcjmvTrJGyN91D5KwP9ZZmNcH4gLlx2cVfdN7QmVLSDt8wZh rAz2qqmqorJVcgU/RxvZeLD0wDZOOoZ/anJ05r/tuiGscsAxst4fTvwwrUuCSuGQY8AnaD GVLSFc9ZQ7yu9kOLH5vc870sQ+WiE0jTPF3ON2oE6FNkvXtGgI+syZunn3pAgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273051; 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=yjSiXN7M4/DoQhjnm281CEQiCrrohJ5rluQQcIgbmgw=; b=xV+/22dWU4tsYwmmsjRpuR2IC3A3lUPS5kqXinBjjIT59+hCFzsY9SHweh5KKVm+NGdRY7 eXf7bcpjmdRo0kdwItedx0TmyPMQr3fvqjHoZlFIs3jjp1k5zu68+3oaicCinRlXtaiEvU MmMq9S2ufg/T7bNjoMB4+5JS4EM/n63sh7WBry3zLh5nWXxNmJmpBpLCWFxG3JLAGmEp9k dO8qnLG1rvJ+TSbwRXeaAZq50vWIIi2I03WKHKqtFqrzmyKsNqzZmYgMg3sJHczFQqYh40 t/pY+vROpcjYr01ymdAIGliwCkS6qhYvLTs/kCKRXnWK0F9B4rju47Gbk25mJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273051; a=rsa-sha256; cv=none; b=fvG5wIR0tqnUT+0vLVOU6pOAzrJslbBjL6IlCxxk4bJv22CUzwLGxpx29Z06tNAJOu4ziW SAmQ6xxqxnSDDHbgvS3iwiHMvNQPBbUdGRuL+sCGEHURAkvzs4Vk736IxvUNTmIS0N5z/R vPB2rxWyCERLTtxhdlBV88KJA6VqmrmOnhbK29X4gDIwZe2DBqsdvnR24fj5A9sDabL8kD RrnwfSFUaSXAPxdQgfaW/6bdJVcLviZ47fwzquyrtri8owjM4jcFy4TW7UbXMsfjO2m+3S XIUg3MDLtsUvDR2YDqhzpGy0f7R0kBZzzXxTlg9zWhp6a2A2qAWSpzATfsTyIg== 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 4b5fgb4jj5z1Bx7; Mon, 26 May 2025 15:24:11 +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 54QFOBZP027017; Mon, 26 May 2025 15:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFOBo9027014; Mon, 26 May 2025 15:24:11 GMT (envelope-from git) Date: Mon, 26 May 2025 15:24:11 GMT Message-Id: <202505261524.54QFOBo9027014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3ea0fa86f6a4 - main - buildkernel: fix build for kernels without VIMAGE 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ea0fa86f6a453c221c0a4aff028cb5220a2ed94 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3ea0fa86f6a453c221c0a4aff028cb5220a2ed94 commit 3ea0fa86f6a453c221c0a4aff028cb5220a2ed94 Author: Gleb Smirnoff AuthorDate: 2025-05-26 15:23:37 +0000 Commit: Gleb Smirnoff CommitDate: 2025-05-26 15:23:37 +0000 buildkernel: fix build for kernels without VIMAGE Fixes: 9b5ddb2accfc80f70a0da52444008ebabef2a9ee --- sys/modules/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index bc6fc7ae1a25..d60f7352f58d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -429,7 +429,7 @@ SUBDIR= \ wlan_xauth \ ${_wpi} \ ${_wpifw} \ - wtap \ + ${_wtap} \ ${_x86bios} \ xdr \ xl \ @@ -824,6 +824,9 @@ _wpi= wpi .if ${MK_SOURCELESS_UCODE} != "no" _wpifw= wpifw .endif +.if ${KERN_OPTS:MVIMAGE} +_wtap= wtap +.endif _x86bios= x86bios .endif