Lines 27-38
Link Here
|
27 |
" |
27 |
" |
28 |
|
28 |
|
29 |
RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
29 |
RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
|
|
30 |
zfs? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
30 |
=sys-freebsd/freebsd-mk-defs-${RV}* |
31 |
=sys-freebsd/freebsd-mk-defs-${RV}* |
31 |
!sys-freebsd/virtio-kmod |
32 |
!sys-freebsd/virtio-kmod |
32 |
!sys-fs/fuse4bsd |
33 |
!sys-fs/fuse4bsd |
33 |
!<sys-freebsd/freebsd-sources-9.2_beta1" |
34 |
!<sys-freebsd/freebsd-sources-9.2_beta1" |
34 |
DEPEND="build-kernel? ( |
35 |
DEPEND="build-kernel? ( |
35 |
dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
36 |
dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
|
|
37 |
zfs? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
36 |
>=sys-freebsd/freebsd-usbin-9.1 |
38 |
>=sys-freebsd/freebsd-usbin-9.1 |
37 |
=sys-freebsd/freebsd-mk-defs-${RV}* |
39 |
=sys-freebsd/freebsd-mk-defs-${RV}* |
38 |
)" |
40 |
)" |
Lines 54-64
Link Here
|
54 |
|
56 |
|
55 |
pkg_setup() { |
57 |
pkg_setup() { |
56 |
# Add the required source files. |
58 |
# Add the required source files. |
57 |
use dtrace && EXTRACTONLY+="cddl/ " |
59 |
if use dtrace || use zfs ; then |
|
|
60 |
EXTRACTONLY+="cddl/ " |
61 |
fi |
58 |
|
62 |
|
59 |
# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
63 |
# WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
60 |
[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" |
64 |
[[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" |
61 |
use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
65 |
if ! use dtrace && ! use zfs ; then |
|
|
66 |
mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
67 |
fi |
62 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" |
68 |
use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" |
63 |
} |
69 |
} |
64 |
|
70 |
|
Lines 135-141
Link Here
|
135 |
|
141 |
|
136 |
insinto "/usr/src/sys" |
142 |
insinto "/usr/src/sys" |
137 |
doins -r "${S}/". |
143 |
doins -r "${S}/". |
138 |
if use dtrace ; then |
144 |
if use dtrace || use zfs ; then |
139 |
insinto "/usr/src/cddl" |
145 |
insinto "/usr/src/cddl" |
140 |
doins -r "${WORKDIR}/cddl/". |
146 |
doins -r "${WORKDIR}/cddl/". |
141 |
fi |
147 |
fi |
Lines 163-169
Link Here
|
163 |
ewarn "export WITHOUT_CDDL=" |
169 |
ewarn "export WITHOUT_CDDL=" |
164 |
ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license." |
170 |
ewarn "Note, Please set USE=zfs if you want to enable modules of CDDL license." |
165 |
fi |
171 |
fi |
166 |
if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
172 |
if ! use dtrace && ! use zfs && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
167 |
ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." |
173 |
ewarn "GENERIC config require sys-freebsd/freebsd-cddl. Please emerge it." |
168 |
fi |
174 |
fi |
169 |
} |
175 |
} |