Page MenuHomeFreeBSD
Files F159434401

D3977.diff
No OneTemporary
Actions

D3977.diff
View Options

Index: sys/modules/Makefile
===================================================================
--- sys/modules/Makefile
+++ sys/modules/Makefile
@@ -98,7 +98,6 @@
${_dpt} \
${_drm} \
${_drm2} \
- ${_dtrace} \
dummynet \
${_ed} \
${_elink} \
@@ -268,7 +267,6 @@
${_nvme} \
${_nvram} \
${_nxge} \
- ${_opensolaris} \
oce \
otus \
otusfw \
@@ -394,13 +392,19 @@
${_x86bios} \
${_xe} \
xl \
- ${_zfs} \
zlib
.if ${MK_AUTOFS} != "no" || defined(ALL_MODULES)
_autofs= autofs
.endif
+.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
+.if ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "sparc64"
+SUBDIR+= dtrace
+.endif
+SUBDIR+= opensolaris
+.endif
+
.if ${MK_CRYPT} != "no" || defined(ALL_MODULES)
.if exists(${.CURDIR}/../opencrypto)
_crypto= crypto
@@ -479,6 +483,10 @@
_cxgbe= cxgbe
.endif
+.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
+SUBDIR+= zfs
+.endif
+
.if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \
${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc"
_syscons= syscons
@@ -509,9 +517,6 @@
_dpms= dpms
_drm= drm
_drm2= drm2
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_dtrace= dtrace
-.endif
_ed= ed
_em= em
_ep= ep
@@ -537,9 +542,6 @@
_linuxkpi= linuxkpi
.endif
_ndis= ndis
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
_pccard= pccard
.if ${MK_OFED} != "no" || defined(ALL_MODULES)
_rdma= rdma
@@ -555,9 +557,6 @@
_wbwd= wbwd
_wi= wi
_xe= xe
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
-_zfs= zfs
-.endif
.if ${MACHINE} != "pc98"
_aac= aac
_aacraid= aacraid
@@ -716,23 +715,14 @@
_cfi= cfi
_cpufreq= cpufreq
_drm= drm
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_dtrace= dtrace
-.endif
_exca= exca
_nvram= powermac_nvram
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
_pccard= pccard
_wi= wi
.endif
.if ${MACHINE_ARCH} == "powerpc64"
_drm2= drm2
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
-_zfs= zfs
-.endif
.endif
.if ${MACHINE_CPUARCH} == "sparc64"
@@ -740,12 +730,6 @@
_em= em
_epic= epic
_igb= igb
-.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-_opensolaris= opensolaris
-.endif
-.if ${MK_ZFS} != "no" || defined(ALL_MODULES)
-_zfs= zfs
-.endif
.endif
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"

File Metadata

Mime Type
text/plain
Expires
Mon, Jun 15, 1:22 AM (12 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33962098
Default Alt Text
D3977.diff (2 KB)

Event Timeline