From nobody Tue Sep 30 17:01:46 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 4cbkqb1RFgz69MQv; Tue, 30 Sep 2025 17:01:47 +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 4cbkqb0qD9z49l0; Tue, 30 Sep 2025 17:01:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759251707; 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=VJF3Yc+KKK73W//4nKxi/+LFtjxjgnTBWIk+kiOyez0=; b=uHbP5FxdpXh2iY1glwCLMtlFrjcgpwss4gmI07mP6feKAatKyMqNFpas6Nvf31Mq+7gAUR ThA3zBUxBbb2ABlvJ+1UeeXMLu9yDpeVnEmxFXNnKGbC82gOfaiAdpkHJfS0R7ZPHES2/1 SKkMk7YK1GC/dp1rtrECK7Y+xC3wXXyM6TO7bz7UlhD/xc15+lwaN5qcwn6eRgSpr9gREb 31O1OJRZo92mQDTZkCpQcTUZhKkJEeayCym88jG6UNKxSd0Y+7p3k0VIEaW7nxF2Yj8bHm BdurHHsYXm3iyQLleaEtTqAnaViRTiTe+mQIJjXWJzPub3Lp9TFnGG5OUqvcOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759251707; 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=VJF3Yc+KKK73W//4nKxi/+LFtjxjgnTBWIk+kiOyez0=; b=CowD0A9OCNTc3uPIDfjPG2kho9v0CkenIj3c53NzzKwSn8PVoFOHGu/C3P84LE4iTS9uD0 uKxcoD5OblPU95AH79fNHSoYNr98uuacY0qHHIYYkUZWxGOHqzNXobukUsyoVCfAP4O/13 3NiThAQRlCu10sbnXOcSvGeGigLfp78Yoc6sXrIbdPNzbOIqrodK4G3pwa8zyoMJrgimSs chPpbMzxzbIe0oMuvbAGWbUL8+IVMJW2UWdYzYWvv9wIge7ma/Xf0t6RjSx4+dcIMTLiA5 a0rCVgaa0MiiGp+yG9Tb8CPwI5mCjQEWXw80XDPNfqGmFwvHKMkzVLCuHv0PNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759251707; a=rsa-sha256; cv=none; b=JmCtJkZQns3mT7yh3nzMYMquvif/117hqBIF5UJgZa7XqnkBk67hrXKN5UbrxbXewT7hM1 dYY1CRMXwXz5uH5jgZavhyNzcavTKcujYusUOpkonhQ2kD6cILGpgSac5eDqyk3Ttze0TI fY+3KVnmxljXzgHz4xJt0URnW+VwmBuewsdlMiXaCDhYJVUPJ7tG7kgXCfYZqlXuFelANH Th9zJP0+8k2va6WD+xCEDt1JUEhsAqwvLQuTcThJWFsCTq9hDJv8YXSTzciZFCsO7mlJeO Fwd94o4Xm1nAgngPpIW+ogGG71bOXiWQJVAg88FsZLYbbAnS6wQPKey3jIlWnQ== 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 4cbkqb0QVHzmD2; Tue, 30 Sep 2025 17:01:47 +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 58UH1kt5035982; Tue, 30 Sep 2025 17:01:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58UH1k0q035979; Tue, 30 Sep 2025 17:01:46 GMT (envelope-from git) Date: Tue, 30 Sep 2025 17:01:46 GMT Message-Id: <202509301701.58UH1k0q035979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f040ee6e4078 - main - virtual_oss: Do not build if WITHOUT_CUSE is set 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f040ee6e407832fc9f08d85cd792d1cfb8104976 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f040ee6e407832fc9f08d85cd792d1cfb8104976 commit f040ee6e407832fc9f08d85cd792d1cfb8104976 Author: Christos Margiolis AuthorDate: 2025-09-30 17:01:37 +0000 Commit: Christos Margiolis CommitDate: 2025-09-30 17:01:37 +0000 virtual_oss: Do not build if WITHOUT_CUSE is set PR: 289920 Fixes: 9cab9fde5eda ("virtual_oss: Port to base") Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D52807 --- lib/Makefile | 4 ++-- libexec/rc/rc.d/Makefile | 7 ++++++- usr.sbin/Makefile | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index bf38a489911d..d43e4d395f56 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -115,8 +115,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libz \ libzstd \ ncurses \ - nss_tacplus \ - virtual_oss + nss_tacplus # Inter-library dependencies. When the makefile for a library contains LDADD # libraries, those libraries should be listed as build order dependencies here. @@ -175,6 +174,7 @@ SUBDIR+= clang .endif SUBDIR.${MK_CUSE}+= libcuse +SUBDIR.${MK_CUSE}+= virtual_oss SUBDIR.${MK_TOOLCHAIN}+=libpe SUBDIR.${MK_DIALOG}+= libdpv libfigpar SUBDIR.${MK_FDT}+= libfdt diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index e4c330afbab7..cd55a05f545e 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -75,7 +75,6 @@ CONFS= DAEMON \ ugidfw \ var \ var_run \ - virtual_oss \ watchdogd CONFGROUPS+= DEVD @@ -216,6 +215,12 @@ CCD= ccd CCDPACKAGE= ccdconfig .endif +.if ${MK_CUSE} != "no" +CONFGROUPS+= VOSS +VOSS= virtual_oss +VOSSPACKAGE= virtual_oss +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CONFGROUPS+= GSSD GSSD= gssd diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index e660c1e59157..3c5fd0973a43 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -99,7 +99,6 @@ SUBDIR= adduser \ valectl \ vigr \ vipw \ - virtual_oss \ wake \ watch \ watchdogd \ @@ -129,6 +128,7 @@ SUBDIR.${MK_BSNMP}+= bsnmpd .if ${MK_CAROOT} != "no" SUBDIR.${MK_OPENSSL}+= certctl .endif +SUBDIR.${MK_CUSE}+= virtual_oss SUBDIR.${MK_CXGBETOOL}+= cxgbetool SUBDIR.${MK_EFI}+= efivar efidp efibootmgr efitable efiwake .if ${MK_OPENSSL} != "no"