head 1.11; access; symbols netbsd-11-0-RC4:1.11 netbsd-11-0-RC3:1.11 netbsd-11-0-RC2:1.11 netbsd-11-0-RC1:1.11 perseant-exfatfs-base-20250801:1.11 netbsd-11:1.11.0.10 netbsd-11-base:1.11 netbsd-10-1-RELEASE:1.11 perseant-exfatfs-base-20240630:1.11 perseant-exfatfs:1.11.0.8 perseant-exfatfs-base:1.11 netbsd-8-3-RELEASE:1.8 netbsd-9-4-RELEASE:1.9 netbsd-10-0-RELEASE:1.11 netbsd-10-0-RC6:1.11 netbsd-10-0-RC5:1.11 netbsd-10-0-RC4:1.11 netbsd-10-0-RC3:1.11 netbsd-10-0-RC2:1.11 netbsd-10-0-RC1:1.11 netbsd-10:1.11.0.6 netbsd-10-base:1.11 netbsd-9-3-RELEASE:1.9 cjep_sun2x-base1:1.11 cjep_sun2x:1.11.0.4 cjep_sun2x-base:1.11 cjep_staticlib_x-base1:1.11 netbsd-9-2-RELEASE:1.9 cjep_staticlib_x:1.11.0.2 cjep_staticlib_x-base:1.11 netbsd-9-1-RELEASE:1.9 phil-wifi-20200421:1.9 phil-wifi-20200411:1.9 is-mlppp:1.9.0.6 is-mlppp-base:1.9 phil-wifi-20200406:1.9 netbsd-8-2-RELEASE:1.8 netbsd-9-0-RELEASE:1.9 netbsd-9-0-RC2:1.9 netbsd-9-0-RC1:1.9 phil-wifi-20191119:1.9 netbsd-9:1.9.0.4 netbsd-9-base:1.9 phil-wifi-20190609:1.9 netbsd-8-1-RELEASE:1.8 netbsd-8-1-RC1:1.8 pgoyette-compat-merge-20190127:1.8.14.1 pgoyette-compat-20190127:1.9 pgoyette-compat-20190118:1.9 pgoyette-compat-1226:1.9 pgoyette-compat-1126:1.9 pgoyette-compat-1020:1.9 pgoyette-compat-0930:1.9 pgoyette-compat-0906:1.9 netbsd-7-2-RELEASE:1.6 pgoyette-compat-0728:1.9 netbsd-8-0-RELEASE:1.8 phil-wifi:1.9.0.2 phil-wifi-base:1.9 pgoyette-compat-0625:1.9 netbsd-8-0-RC2:1.8 pgoyette-compat-0521:1.8 pgoyette-compat-0502:1.8 pgoyette-compat-0422:1.8 netbsd-8-0-RC1:1.8 pgoyette-compat-0415:1.8 pgoyette-compat-0407:1.8 pgoyette-compat-0330:1.8 pgoyette-compat-0322:1.8 pgoyette-compat-0315:1.8 netbsd-7-1-2-RELEASE:1.6 pgoyette-compat:1.8.0.14 pgoyette-compat-base:1.8 netbsd-7-1-1-RELEASE:1.6 matt-nb8-mediatek:1.8.0.12 matt-nb8-mediatek-base:1.8 perseant-stdc-iso10646:1.8.0.10 perseant-stdc-iso10646-base:1.8 netbsd-8:1.8.0.8 netbsd-8-base:1.8 prg-localcount2-base3:1.8 prg-localcount2-base2:1.8 prg-localcount2-base1:1.8 prg-localcount2:1.8.0.6 prg-localcount2-base:1.8 pgoyette-localcount-20170426:1.8 bouyer-socketcan-base1:1.8 pgoyette-localcount-20170320:1.8 netbsd-7-1:1.6.0.10 netbsd-7-1-RELEASE:1.6 netbsd-7-1-RC2:1.6 netbsd-7-nhusb-base-20170116:1.6 bouyer-socketcan:1.8.0.4 bouyer-socketcan-base:1.8 pgoyette-localcount-20170107:1.8 netbsd-7-1-RC1:1.6 pgoyette-localcount-20161104:1.8 netbsd-7-0-2-RELEASE:1.6 localcount-20160914:1.8 netbsd-7-nhusb:1.6.0.8 netbsd-7-nhusb-base:1.6 pgoyette-localcount-20160806:1.8 pgoyette-localcount-20160726:1.8 pgoyette-localcount:1.8.0.2 pgoyette-localcount-base:1.8 netbsd-7-0-1-RELEASE:1.6 netbsd-7-0:1.6.0.6 netbsd-7-0-RELEASE:1.6 netbsd-7-0-RC3:1.6 netbsd-7-0-RC2:1.6 netbsd-7-0-RC1:1.6 netbsd-6-0-6-RELEASE:1.4 netbsd-6-1-5-RELEASE:1.4 netbsd-7:1.6.0.4 netbsd-7-base:1.6 yamt-pagecache-base9:1.6 yamt-pagecache-tag8:1.4 netbsd-6-1-4-RELEASE:1.4 netbsd-6-0-5-RELEASE:1.4 tls-earlyentropy:1.6.0.2 tls-earlyentropy-base:1.6 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.6 riastradh-drm2-base3:1.5 netbsd-6-1-3-RELEASE:1.4 netbsd-6-0-4-RELEASE:1.4 netbsd-6-1-2-RELEASE:1.4 netbsd-6-0-3-RELEASE:1.4 netbsd-6-1-1-RELEASE:1.4 riastradh-drm2-base2:1.4 riastradh-drm2-base1:1.4 riastradh-drm2:1.4.0.16 riastradh-drm2-base:1.4 netbsd-6-1:1.4.0.20 netbsd-6-0-2-RELEASE:1.4 netbsd-6-1-RELEASE:1.4 netbsd-6-1-RC4:1.4 netbsd-6-1-RC3:1.4 agc-symver:1.4.0.18 agc-symver-base:1.4 netbsd-6-1-RC2:1.4 netbsd-6-1-RC1:1.4 yamt-pagecache-base8:1.4 netbsd-6-0-1-RELEASE:1.4 yamt-pagecache-base7:1.4 matt-nb6-plus-nbase:1.4 yamt-pagecache-base6:1.4 netbsd-6-0:1.4.0.14 netbsd-6-0-RELEASE:1.4 netbsd-6-0-RC2:1.4 tls-maxphys:1.4.0.12 tls-maxphys-base:1.6 matt-nb6-plus:1.4.0.10 matt-nb6-plus-base:1.4 netbsd-6-0-RC1:1.4 yamt-pagecache-base5:1.4 yamt-pagecache-base4:1.4 netbsd-6:1.4.0.8 netbsd-6-base:1.4 yamt-pagecache-base3:1.4 yamt-pagecache-base2:1.4 yamt-pagecache:1.4.0.6 yamt-pagecache-base:1.4 cherry-xenmp:1.4.0.4 cherry-xenmp-base:1.4 bouyer-quota2-nbase:1.4 bouyer-quota2:1.4.0.2 bouyer-quota2-base:1.4 matt-mips64-premerge-20101231:1.4 darran-pre-netbsd:1.2 darran-pre-freebsd:1.1 darran-pre-dtrace:1.1 matt-premerge-20091211:1.1; locks; strict; comment @# @; 1.11 date 2021.04.07.09.57.02; author simonb; state Exp; branches; next 1.10; commitid giL4QRYAztsprlOC; 1.10 date 2021.03.29.01.57.09; author simonb; state Exp; branches; next 1.9; commitid uSA3NeYQyuVV49NC; 1.9 date 2018.05.28.21.05.08; author chs; state Exp; branches; next 1.8; commitid NQFwoUduS0toJ6EA; 1.8 date 2016.02.29.17.46.54; author riastradh; state Exp; branches 1.8.14.1; next 1.7; commitid s6ayNmpuDmv7XPWy; 1.7 date 2016.02.28.19.10.10; author christos; state Exp; branches; next 1.6; commitid RZ0KUC0jZHGfsIWy; 1.6 date 2014.03.25.09.52.55; author ozaki-r; state Exp; branches; next 1.5; commitid BC7cPubsAsmw04ux; 1.5 date 2013.09.11.23.04.10; author joerg; state Exp; branches; next 1.4; commitid LfFxmAH008vTF45x; 1.4 date 2010.02.24.12.18.37; author tron; state Exp; branches 1.4.6.1 1.4.12.1; next 1.3; 1.3 date 2010.02.21.01.46.34; author darran; state Exp; branches; next 1.2; 1.2 date 2010.02.21.00.49.57; author darran; state Exp; branches; next 1.1; 1.1 date 2009.08.07.20.57.55; author haad; state Exp; branches; next ; 1.8.14.1 date 2018.06.25.07.25.24; author pgoyette; state Exp; branches; next ; commitid 8PtAu9af7VvhiDHA; 1.4.6.1 date 2014.05.22.14.01.23; author yamt; state Exp; branches; next ; commitid JkmseppLYEAJxxBx; 1.4.12.1 date 2014.08.19.23.52.22; author tls; state Exp; branches; next ; commitid jTnpym9Qu0o4R1Nx; desc @@ 1.11 log @Revert the change to not build and install /usr/lib/dtrace/drti.o; this is used by the ruby30-base package when compiled with the dtrace option (enabled by default). Problem found by ryoon@@. @ text @# $NetBSD: Makefile,v 1.10 2021/03/29 01:57:09 simonb Exp $ # # .include .if (defined(MKDTRACE) && ${MKDTRACE} != "no") SUBDIR+= libdtrace SUBDIR+= drti .endif .if ${MKCTF:Uno} != "no" SUBDIR+= libctf .endif .if !defined(MKZFS) || ${MKZFS} != "no" SUBDIR+= libavl SUBDIR+= libnvpair SUBDIR+= libumem SUBDIR+= libuutil SUBDIR+= .WAIT SUBDIR+= libzfs_core SUBDIR+= .WAIT SUBDIR+= libzfs SUBDIR+= libzpool .endif .include @ 1.10 log @Don't build or install /usr/lib/dtrace/drti.o - currently not used, may be one day... @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2018/05/28 21:05:08 chs Exp $ d9 1 a9 2 # drti.o is not (yet) used # SUBDIR+= drti @ 1.9 log @merge a new version of the CDDL dtrace and ZFS code. this changes the upstream vendor from OpenSolaris to FreeBSD, and this version is based on FreeBSD svn r315983. in addition to the 10 years of improvements from upstream, this version also has these NetBSD-specific enhancements: - dtrace FBT probes can now be placed in kernel modules. - ZFS now supports mmap(). @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2016/02/29 17:46:54 riastradh Exp $ d9 2 a10 1 SUBDIR+= drti @ 1.8 log @Let MKCTF alone control whether we build libctf. If MKDTRACE=yes MKCTF=no makes no sense, we can express that somewhere else, not as a confusing set lists error at the end -- as far as I know, there's no way to express MKDTRACE *or* MKCTF as a condition for set list entries. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2016/02/28 19:10:10 christos Exp $ d21 2 @ 1.8.14.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2018/05/28 21:05:08 chs Exp $ a20 2 SUBDIR+= libzfs_core SUBDIR+= .WAIT @ 1.7 log @hook drti @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2014/03/25 09:52:55 ozaki-r Exp $ d11 1 a11 1 .if ${MKDTRACE:Uno} != "no" || ${MKCTF:Uno} != "no" @ 1.6 log @Add MKCTF This variable separates CTF stuffs from MKDTRACE; we can build DTrace solely without building and using them. This allows us to use DTrace even if CTF stuffs have problems (actually they have now). This variable would be merged into MKDTRACE eventually, once CTF stuffs work correctly again. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2013/09/11 23:04:10 joerg Exp $ d9 1 @ 1.5 log @If a library needs a symbol from another library, pull that library in explicitly, even if the DT_NEEDED closure would normally already ensure the presence. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2010/02/24 12:18:37 tron Exp $ d9 2 @ 1.4 log @Include "bsd.own.mk" before checking "MKDTRACE" to allow setting it in "/etc/mk.conf". @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2010/02/21 01:46:34 darran Exp $ d17 1 @ 1.4.12.1 log @Rebase to HEAD as of a few days ago. @ text @d1 1 a1 1 # $NetBSD$ a8 2 .endif .if ${MKDTRACE:Uno} != "no" || ${MKCTF:Uno} != "no" a16 1 SUBDIR+= .WAIT @ 1.4.6.1 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2010/02/24 12:18:37 tron Exp $ a8 2 .endif .if ${MKDTRACE:Uno} != "no" || ${MKCTF:Uno} != "no" a16 1 SUBDIR+= .WAIT @ 1.3 log @Apply NetBSD changes to DTrace. Ok with core@@. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2009/08/07 20:57:55 haad Exp $ d5 2 @ 1.2 log @Add the FreeBSD 8-RC1 changes for DTrace. Ok with core@@. @ text @d1 3 a3 1 # $FreeBSD: src/cddl/lib/Makefile,v 1.9.2.1 2009/08/03 08:13:06 kensmith Exp $ d5 4 a8 11 .include SUBDIR= drti \ libavl \ libctf \ libdtrace \ libnvpair \ libumem \ libuutil \ ${_libzfs} \ ${_libzpool} d10 7 a16 5 .if ${MK_ZFS} != "no" _libzfs= libzfs .if ${MK_LIBTHR} != "no" _libzpool= libzpool .endif @ 1.1 log @Add NetBSD Solaris compat code and reachover Makefiles. Most of code written by Andrew Doran some of it by me. This is still work in progress code. There are known issues. Zfs can panic your system still. I will commit integration bits and needed kernel bits later when we fix most obvious bugs. This code need some support from our kernel which I will commit in a separate patch and therefore itnot work yet. Issues: 1) Support for openat/fstatat syscalls. 2) getnewvnode locking against myself panic when reclaiming vnodes 3) Replace solaris taskq with our workqueue which doesn't need to alloc anything during work. 4) Investigate problems with NO_WAIT allocations. Oked by core@@ and ad@@. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2009/03/26 22:11:44 ad Exp $ d3 17 a19 7 .if !defined(MKZFS) || ${MKZFS} != "no" SUBDIR+= libavl SUBDIR+= libnvpair SUBDIR+= libumem SUBDIR+= libuutil SUBDIR+= libzfs SUBDIR+= libzpool @