From nobody Fri Oct 10 00:21:10 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 4cjS8R2PZFz6CNSw; Fri, 10 Oct 2025 00:21: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjS8Q4lzJz41WS; Fri, 10 Oct 2025 00:21:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760055670; 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=ATtecFOfEfDnwbW3ACLxrKBfIgLEB1wsyFvRNjCGfQA=; b=Q2O5OhIvNIEnuqFXHqYhGPJ1TFVTu2dBui+y6a/HCb1YuwuUuo58mJ39XbQPgxZ2/V5gsD xJo5TWsd0YTtp+oBVaMH6/M73JmwSDbNLeqSfn1Z0bE5TPFwqPLt7EoBm7muz5rSzuyl5k rHLhOliEWUf9CwBTVEEkxwDVpRYlEdfhB+Mm7bu6YhEWlCWbfdMoY7lkvuWzs878cXVYGY Il1OBhV21amZhd6vfPEs90QTxCA7/CBSSL5dPvmgV2nGYT0Krc6KhN71rhwgBhb8ps18+R DHTbJxU9j2cjhkntDsLONtBZGOYNZukQF2ExL/X8X6ygmAf4SIyMpXGgAkIlog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760055670; 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=ATtecFOfEfDnwbW3ACLxrKBfIgLEB1wsyFvRNjCGfQA=; b=oX9ioHKQtSyt63ZgYU4yxTopDRR5qcg9EmIH/xMimjprQht0PoZutepeG5rVKfmmv/YbYY K3hCijC8ZjuEZQtcdjAXGO4N8U7z/lygx2WitvpnNSa5K0d3M7WPK1v2AiL5benCvMYu/8 UDNzztsSY5CT+mTPjpbuVW1py1pNaAW0cZRBDa2cP323nF7eZZ8ypBU+DSAeodIbwmYj4S 64zuAoVS3GLIqD9r8HvCuEo5b3QUN2+R6WQmoM22g/gIUKa6Pjm6PlyZApDPuNJDwvRemH nUZi4c2BtIYntuL0nGWyZyWNk6cEs7/fl+nx/5ci1x3j1wg5vZXQLRuQd/Ng3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760055670; a=rsa-sha256; cv=none; b=jzLhzR5l4Wumk4Ka2nE/67S5kTsQKOisUNTr7lWS15gAXpNZWXxolvoB259HFnGsBpdfmw MFzTZXxg+ZkEfGQZvvsV6TRMsRAQRd+1FbcGCrKnyTcSa0G6HtK0WvkKdyxNYXRaR3rziu PQ4FxtDnfY74FHa/O+Uq+TmpqmEf2rs7rZlXbemNO0zjmBGTTrACUL+5idwqVAMS7tOkzK c79nMDpZ2srxzlK2u7PaiPu2q5h/4rmrj81q/qqJEnYxp0RCF6gObqaWMpjn1QUMsceGWg Qshv0YiDme4aIJ5Q6WLloZMoKt2RMHZtaeHbwyz3Re5RW+waxuZI8sRMD9a8bg== 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 4cjS8Q48MHzgNq; Fri, 10 Oct 2025 00:21:10 +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 59A0LAWp001937; Fri, 10 Oct 2025 00:21:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A0LAUw001934; Fri, 10 Oct 2025 00:21:10 GMT (envelope-from git) Date: Fri, 10 Oct 2025 00:21:10 GMT Message-Id: <202510100021.59A0LAUw001934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 498368529011 - main - modules: Simplify some expressions 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 498368529011086067ed48e40cbfd46a4d5ef2ca Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=498368529011086067ed48e40cbfd46a4d5ef2ca commit 498368529011086067ed48e40cbfd46a4d5ef2ca Author: Warner Losh AuthorDate: 2025-10-08 04:41:03 +0000 Commit: Warner Losh CommitDate: 2025-10-10 00:12:38 +0000 modules: Simplify some expressions When we only use SYSDIR once or twice, expand it and don't define it. Minor other consistency changes. Sponsored by: Netflix --- sys/modules/ktest/ktest/Makefile | 3 +-- sys/modules/ktest/ktest_example/Makefile | 5 ++--- sys/modules/netgraph/Makefile | 2 -- sys/modules/opensolaris/Makefile | 2 +- sys/modules/rtwn/Makefile | 4 +--- sys/modules/rtwn_pci/Makefile | 4 +--- sys/modules/rtwn_usb/Makefile | 4 +--- sys/modules/sound/driver/Makefile | 3 +-- sys/modules/sound/sound/Makefile | 1 - 9 files changed, 8 insertions(+), 20 deletions(-) diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile index 0302a8aabd55..9741662ef709 100644 --- a/sys/modules/ktest/ktest/Makefile +++ b/sys/modules/ktest/ktest/Makefile @@ -1,6 +1,5 @@ PACKAGE= tests -SYSDIR?=${SRCTOP}/sys -.PATH: ${SYSDIR}/tests +.PATH: ${SRCTOP}/sys/tests KMOD= ktest SRCS= ktest.c diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile index 2b572d867aa5..aacc8f0e4ca5 100644 --- a/sys/modules/ktest/ktest_example/Makefile +++ b/sys/modules/ktest/ktest_example/Makefile @@ -1,9 +1,8 @@ PACKAGE= tests -SYSDIR?=${SRCTOP}/sys -.include "${SYSDIR}/conf/kern.opts.mk" +.include "${SRCTOP}/sys/conf/kern.opts.mk" -.PATH: ${SYSDIR}/tests +.PATH: ${SRCTOP}/sys/tests KMOD= ktest_example SRCS= ktest_example.c diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index 94560d5c51d7..b2d65af16e7f 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -1,5 +1,3 @@ -# $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile index 98f52057e45e..7e2d5f9101ad 100644 --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -1,4 +1,4 @@ -SYSDIR?= ${SRCTOP}/sys +SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/compat/opensolaris/kern .PATH: ${SYSDIR}/contrib/openzfs/module/os/freebsd/spl diff --git a/sys/modules/rtwn/Makefile b/sys/modules/rtwn/Makefile index 9afdd2084ecb..f15cbbe8236b 100644 --- a/sys/modules/rtwn/Makefile +++ b/sys/modules/rtwn/Makefile @@ -1,7 +1,5 @@ .PATH: ${SRCTOP}/sys/dev/rtwn - -SYSDIR?=${SRCTOP}/sys -.include "${SYSDIR}/conf/kern.opts.mk" +.include "${SRCTOP}/sys/conf/kern.opts.mk" KMOD = rtwn SRCS = if_rtwn.c if_rtwn_tx.c if_rtwn_rx.c if_rtwn_beacon.c \ diff --git a/sys/modules/rtwn_pci/Makefile b/sys/modules/rtwn_pci/Makefile index ce2144121e88..3fea80d7d256 100644 --- a/sys/modules/rtwn_pci/Makefile +++ b/sys/modules/rtwn_pci/Makefile @@ -1,7 +1,5 @@ .PATH: ${SRCTOP}/sys/dev/rtwn/pci - -SYSDIR?=${SRCTOP}/sys -.include "${SYSDIR}/conf/kern.opts.mk" +.include "${SRCTOP}/sys/conf/kern.opts.mk" KMOD = if_rtwn_pci SRCS = rtwn_pci_attach.c rtwn_pci_reg.c rtwn_pci_rx.c rtwn_pci_tx.c \ diff --git a/sys/modules/rtwn_usb/Makefile b/sys/modules/rtwn_usb/Makefile index 16899b8a8c49..6a73276d088c 100644 --- a/sys/modules/rtwn_usb/Makefile +++ b/sys/modules/rtwn_usb/Makefile @@ -1,7 +1,5 @@ .PATH: ${SRCTOP}/sys/dev/rtwn/usb - -SYSDIR?=${SRCTOP}/sys -.include "${SYSDIR}/conf/kern.opts.mk" +.include "${SRCTOP}/sys/conf/kern.opts.mk" KMOD = if_rtwn_usb SRCS = rtwn_usb_attach.c rtwn_usb_ep.c rtwn_usb_reg.c rtwn_usb_rx.c \ diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile index ff9499fdf841..02703d4b591a 100644 --- a/sys/modules/sound/driver/Makefile +++ b/sys/modules/sound/driver/Makefile @@ -1,5 +1,4 @@ -SYSDIR?=${SRCTOP}/sys -.include "${SYSDIR}/conf/kern.opts.mk" +.include "${SRCTOP}/sys/conf/kern.opts.mk" # Modules that include binary-only blobs of microcode should be selectable by # MK_SOURCELESS_UCODE option (see below). diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index f3978e9bd9cc..169b1a2730ec 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -1,5 +1,4 @@ SYSDIR?=${SRCTOP}/sys - .PATH: ${SYSDIR}/dev/sound .PATH: ${SYSDIR}/dev/sound/pcm .PATH: ${SYSDIR}/dev/sound/midi