Page MenuHomeFreeBSD
Files F144591730

D54456.1775622106.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D54456.1775622106.diff
View Options

diff --git a/lib/Makefile b/lib/Makefile
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -176,7 +176,6 @@
.endif
SUBDIR.${MK_CUSE}+= libcuse
-SUBDIR.${MK_CUSE}+= virtual_oss
SUBDIR.${MK_TOOLCHAIN}+=libpe
SUBDIR.${MK_DIALOG}+= libdpv libfigpar
SUBDIR.${MK_FDT}+= libfdt
@@ -238,13 +237,14 @@
SUBDIR.${MK_RADIUS_SUPPORT}+= libradius
SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil
SUBDIR.${MK_TELNET}+= libtelnet
+SUBDIR.${MK_OFED}+= ofed
SUBDIR.${MK_TESTS_SUPPORT}+= atf
SUBDIR.${MK_TESTS_SUPPORT}+= liblutok
SUBDIR.${MK_TESTS}+= tests
SUBDIR.${MK_UNBOUND}+= libunbound
SUBDIR.${MK_USB}+= libusbhid libusb
-SUBDIR.${MK_OFED}+= ofed
SUBDIR.${MK_VERIEXEC}+= libveriexec
+SUBDIR.${MK_VOSS}+= virtual_oss
SUBDIR.${MK_ZFS}+= libbe
.if !make(install)
diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -301,7 +301,7 @@
VIPACKAGE= vi
VI= virecover
-CONFGROUPS.${MK_CUSE}+= VOSS
+CONFGROUPS.${MK_VOSS}+= VOSS
VOSSPACKAGE= sound
VOSS= virtual_oss
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -9148,6 +9148,12 @@
. endif
.endif
+.if ${MK_VOSS} == no
+OLD_FILES+=lib/virtual_oss
+OLD_FILES+=usr.sbin/virtual_oss
+OLD_FILES+=libexec/rc/rc.d/virtual_oss
+.endif
+
.if ${MK_WIRELESS} == no
OLD_FILES+=etc/regdomain.xml
OLD_FILES+=etc/rc.d/hostapd
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -131,7 +131,6 @@
.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"
@@ -212,6 +211,7 @@
SUBDIR.${MK_UTMPX}+= ac
SUBDIR.${MK_UTMPX}+= lastlogin
SUBDIR.${MK_UTMPX}+= utx
+SUBDIR.${MK_VOSS}+= virtual_oss
SUBDIR.${MK_WIRELESS}+= wlandebug
SUBDIR.${MK_WIRELESS}+= wlanstat
SUBDIR.${MK_WIRELESS}+= wpa

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 8, 4:21 AM (13 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28297687
Default Alt Text
D54456.1775622106.diff (2 KB)

Event Timeline