From nobody Wed Mar 01 18:33:00 2023 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 4PRjXX5GJ5z3vBm9; Wed, 1 Mar 2023 18:33:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRjXX4jgwz46lN; Wed, 1 Mar 2023 18:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695580; 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=7Gw4KNl+QgoBwgkCJRBbJWBsoACmrv2yIumxtdv64zw=; b=soElvAzAnHt/IyMEsPa/6Xq5cnFZLPnNjoHbhIW6V9SFjUoZ4uLnMko4GdQX1NCMc3rnoM YV0qZHCnxZTyYzXWXONuQU3VxmFS/zLvvpe1UqiypsblinDgVhOHnLxzhmro5RQOlUD+aW n/eG+mJ+BFx9ILP47o6jj5vWxmmj5wLkd9EohYJSvM0IU+Gj9jPAHat6fu9lCV0AEN1ptq k/uOF0AdCPfGBJ13OLwm5hySDzOQxNtPl9EyQgdgSCZZMgLqp1nAMqGB54tKm3q4LvyKWT gkZfiPVsDgiPmxKZharsgG8MtnCMm1vH/U0wkINR3AukN441BD/LTTKH44cByA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677695580; 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=7Gw4KNl+QgoBwgkCJRBbJWBsoACmrv2yIumxtdv64zw=; b=J5Ko8Q1vZtK35jRwf3xQX7SGdIDkCUQ8JchM0s3PsyO7PINviWqdKTUykaqvA3REK+VdvS U+vn/6HHmeRcQksUOYq+BpQZ7M/tKWLWBONIW4KX2ruyQZFgQISWupd+fQsMZlxBAyt2xA ay8QrYTGZ20yKz1UEAMiP90bZoEz3TzMQ+GwcKnjFA7OJydUMr6qa63VPM43FReAGprvWV fd+NKoxVNAuKDvqeZmlzUGhmlUkaQ9p3Bv/a8ugf8oCcQUecnuMCSG+osfH/xeVrWY/xkI nThuVCl8wljCEi7lSiuAbVkE2RihCpUdHX/YAliylQj1U9j4K8QejRj6NSJL1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677695580; a=rsa-sha256; cv=none; b=KYCesmSp1F6EZZVPzZP8BvKH8q0HGzuL8kx4AZPvyvTlqAYKnwGvR437ulxp895EGjl4JN n+5VAOVSLh5tOYy2Lk1cmMGsGID7zXOPH3wyS3oWv9LiLiz2j9xkJhblfUsoXKk94rXi4s 1iJ9JETofmLJdA/MyALBVGSRD5RkHue3+ehrQ8Ci7G6f+QvOiFSQNfp2y/rX/huESMp4D0 tVp7COgZaxi0NNOmBJ24iOr8CaQaq+XLSTpc92uP3NR0j4ekhPzOyGYP/MdjcVzSDmnLbG JDE50b8muVu6O/4voWTblaUqbAYr6StY2sL8ED/aafkzAkwsSS91R5TxkZBgZA== 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 4PRjXX3qGhzl0d; Wed, 1 Mar 2023 18:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321IX0BZ099841; Wed, 1 Mar 2023 18:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321IX0E6099840; Wed, 1 Mar 2023 18:33:00 GMT (envelope-from git) Date: Wed, 1 Mar 2023 18:33:00 GMT Message-Id: <202303011833.321IX0E6099840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: c3dd45c47be9 - main - sys/modules: Make use of SRCS.${KERN_OPT}. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3dd45c47be9b3ea47edc84c6bc6187ab74d966b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3dd45c47be9b3ea47edc84c6bc6187ab74d966b commit c3dd45c47be9b3ea47edc84c6bc6187ab74d966b Author: John Baldwin AuthorDate: 2023-03-01 18:32:30 +0000 Commit: John Baldwin CommitDate: 2023-03-01 18:32:30 +0000 sys/modules: Make use of SRCS.${KERN_OPT}. kmod.mk appends the value of SRCS.${KERN_OPT} for each defined kernel option to SRCS. This helper is shorter than appending to SRCS under explicit checks on KERN_OPTS. Reviewed by: imp Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38738 --- sys/modules/cxgbe/if_cxgbe/Makefile | 4 +--- sys/modules/geom/geom_uzip/Makefile | 4 +--- sys/modules/vmm/Makefile | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile index 723029264bac..0a4103de17c8 100644 --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -23,9 +23,7 @@ SRCS+= t4_filter.c SRCS+= t4_hw.c SRCS+= t4_if.c t4_if.h SRCS+= t4_iov.c -.if ${KERN_OPTS:MKERN_TLS} != "" -SRCS+= t6_kern_tls.c -.endif +SRCS.KERN_TLS+= t6_kern_tls.c SRCS+= t4_keyctx.c SRCS+= t4_l2t.c SRCS+= t4_main.c diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile index 7269a49422ff..8cebb60b54d8 100644 --- a/sys/modules/geom/geom_uzip/Makefile +++ b/sys/modules/geom/geom_uzip/Makefile @@ -10,10 +10,8 @@ SRCS+= g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zlib.h g_uzip_softc.h \ g_uzip_wrkthr.h # This works for buildkernel, but will disable zstd in geom_uzip out of tree. -.if ${KERN_OPTS:MZSTDIO} != "" -SRCS+= g_uzip_zstd.c g_uzip_zstd.h +SRCS.ZSTDIO+= g_uzip_zstd.c g_uzip_zstd.h CFLAGS.g_uzip_zstd.c+= -I${SRCTOP}/sys/contrib/zstd/lib/freebsd -.endif #CFLAGS= -g -DINVARIANT_SUPPORT -DINVARIANTS diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index ef0d9dcb6786..412342967eec 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -61,9 +61,7 @@ SRCS+= vmcb.c \ amdvi_hw.c \ svm_msr.c -.if ${KERN_OPTS:MBHYVE_SNAPSHOT} != "" -SRCS+= vmm_snapshot.c -.endif +SRCS.BHYVE_SNAPSHOT= vmm_snapshot.c CLEANFILES= vmx_assym.h vmx_genassym.o svm_assym.h svm_genassym.o