The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f040ee6e407832fc9f08d85cd792d1cfb8104976
commit f040ee6e407832fc9f08d85cd792d1cfb8104976 Author: Christos Margiolis <[email protected]> AuthorDate: 2025-09-30 17:01:37 +0000 Commit: Christos Margiolis <[email protected]> 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"
