head 1.2; access; symbols netbsd-11-0-RC4:1.2 netbsd-11-0-RC3:1.2 netbsd-11-0-RC2:1.2 netbsd-11-0-RC1:1.2 perseant-exfatfs-base-20250801:1.2 netbsd-11:1.2.0.12 netbsd-11-base:1.2 netbsd-10-1-RELEASE:1.2 perseant-exfatfs-base-20240630:1.2 perseant-exfatfs:1.2.0.10 perseant-exfatfs-base:1.2 netbsd-9-4-RELEASE:1.1.6.1 netbsd-10-0-RELEASE:1.2 netbsd-10-0-RC6:1.2 netbsd-10-0-RC5:1.2 netbsd-10-0-RC4:1.2 netbsd-10-0-RC3:1.2 netbsd-10-0-RC2:1.2 netbsd-10-0-RC1:1.2 netbsd-10:1.2.0.8 netbsd-10-base:1.2 netbsd-9-3-RELEASE:1.1.6.1 cjep_sun2x-base1:1.2 cjep_sun2x:1.2.0.6 cjep_sun2x-base:1.2 cjep_staticlib_x-base1:1.2 netbsd-9-2-RELEASE:1.1.6.1 cjep_staticlib_x:1.2.0.4 cjep_staticlib_x-base:1.2 netbsd-9-1-RELEASE:1.1.6.1 phil-wifi-20200421:1.2 phil-wifi-20200411:1.2 is-mlppp:1.2.0.2 is-mlppp-base:1.2 phil-wifi-20200406:1.2 netbsd-9-0-RELEASE:1.1.6.1 netbsd-9-0-RC2:1.1.6.1 netbsd-9-0-RC1:1.1.6.1 phil-wifi-20191119:1.2 netbsd-9:1.1.0.6 netbsd-9-base:1.1 phil-wifi-20190609:1.1 pgoyette-compat-merge-20190127:1.1.2.2 pgoyette-compat-20190127:1.1 pgoyette-compat-20190118:1.1 pgoyette-compat-1226:1.1 pgoyette-compat-1126:1.1 pgoyette-compat-1020:1.1 pgoyette-compat-0930:1.1 pgoyette-compat-0906:1.1 pgoyette-compat-0728:1.1 phil-wifi:1.1.0.4 phil-wifi-base:1.1 pgoyette-compat:1.1.0.2 pgoyette-compat-0625:1.1; locks; strict; comment @# @; 1.2 date 2019.09.22.18.45.20; author brad; state Exp; branches; next 1.1; commitid jgzIBTWlcjibr2EB; 1.1 date 2018.05.28.23.47.40; author chs; state Exp; branches 1.1.2.1 1.1.4.1 1.1.6.1; next ; commitid 3PaK7wmcaMagD7EA; 1.1.2.1 date 2018.05.28.23.47.40; author pgoyette; state dead; branches; next 1.1.2.2; commitid 8PtAu9af7VvhiDHA; 1.1.2.2 date 2018.06.25.07.25.25; author pgoyette; state Exp; branches; next ; commitid 8PtAu9af7VvhiDHA; 1.1.4.1 date 2020.04.13.07.56.39; author martin; state Exp; branches; next ; commitid X01YhRUPVUDaec4C; 1.1.6.1 date 2019.09.27.09.24.30; author martin; state Exp; branches; next ; commitid Sk8ki5IPAe9DcDEB; desc @@ 1.2 log @ Add USE_SHLIBDIR=yes to a number of Makefiles for the libraries used by /sbin/{zfs,zpool,mount_zfs}. The general effect is to move them from /usr/lib to /lib. Compatibility links are installed in /usr/lib and nothing that is installed, say in /usr/pkg, appears to break. With this, it is possible to have a /var and /usr mount using ZFS legacy mounting early on in the boot process. Run tested on amd64 and i386 and compile tested on evbarm. @ text @# $NetBSD: Makefile,v 1.1 2018/05/28 23:47:40 chs Exp $ .include USE_SHLIBDIR= yes .PATH: ${.CURDIR}/../../dist/common/zfs .PATH: ${.CURDIR}/../../dist/common/fs/zfs .PATH: ${.CURDIR}/../../dist/lib/libzfs/common .PATH: ${.CURDIR}/../../dist/lib/libzfs_core/common LIB= zfs_core LIBDPLIBS+= \ nvpair ${.CURDIR}/../libnvpair SRCS= libzfs_core.c \ libzfs_core_compat.c \ zfs_ioctl_compat.c SRCS+= libzfs_compat.c .include "../../Makefile.zfs" .include @ 1.1 log @add some new files missed by my script: 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$ d5 2 @ 1.1.4.1 log @Mostly merge changes from HEAD upto 20200411 @ text @a4 2 USE_SHLIBDIR= yes @ 1.1.6.1 log @Pull up following revision(s) (requested by brad in ticket #252): external/cddl/osnet/lib/libzpool/Makefile: revision 1.13 lib/libpthread/Makefile: revision 1.95 external/cddl/osnet/lib/libuutil/Makefile: revision 1.6 distrib/sets/lists/base/shl.mi: revision 1.871 external/cddl/osnet/lib/libzfs_core/Makefile: revision 1.2 external/cddl/osnet/lib/libnvpair/Makefile: revision 1.11 external/cddl/osnet/lib/libzfs/Makefile: revision 1.10 external/cddl/osnet/lib/libavl/Makefile: revision 1.6 distrib/sets/lists/debug/shl.mi: revision 1.230 external/cddl/osnet/lib/libumem/Makefile: revision 1.7 Add USE_SHLIBDIR=yes to a number of Makefiles for the libraries used by /sbin/{zfs,zpool,mount_zfs}. The general effect is to move them from /usr/lib to /lib. Compatibility links are installed in /usr/lib and nothing that is installed, say in /usr/pkg, appears to break. With this, it is possible to have a /var and /usr mount using ZFS legacy mounting early on in the boot process. Run tested on amd64 and i386 and compile tested on evbarm. Fix MKDEBUG distrib sets Add libpthread, libnvpair and ZFS libs to dynamicroot. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1 2018/05/28 23:47:40 chs Exp $ a4 2 USE_SHLIBDIR= yes @ 1.1.2.1 log @file Makefile was added on branch pgoyette-compat on 2018-06-25 07:25:25 +0000 @ text @d1 24 @ 1.1.2.2 log @Sync with HEAD @ text @a0 24 # $NetBSD: Makefile,v 1.1 2018/05/28 23:47:40 chs Exp $ .include .PATH: ${.CURDIR}/../../dist/common/zfs .PATH: ${.CURDIR}/../../dist/common/fs/zfs .PATH: ${.CURDIR}/../../dist/lib/libzfs/common .PATH: ${.CURDIR}/../../dist/lib/libzfs_core/common LIB= zfs_core LIBDPLIBS+= \ nvpair ${.CURDIR}/../libnvpair SRCS= libzfs_core.c \ libzfs_core_compat.c \ zfs_ioctl_compat.c SRCS+= libzfs_compat.c .include "../../Makefile.zfs" .include @