Add zfs sets and needed veriables to hook zfs into the build. ZFS on i386
need still one fix othervise it should be ready for testing.
This commit is contained in:
haad
parent
7b7a580067
commit
fbd1c01117
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.831 2009/09/29 23:56:26 tsarna Exp $
|
||||
# $NetBSD: mi,v 1.832 2009/10/05 22:32:58 haad Exp $
|
||||
#
|
||||
# Note: Don't delete entries from here - mark them as "obsolete" instead,
|
||||
# unless otherwise stated below.
|
||||
|
|
@ -301,6 +301,8 @@
|
|||
./sbin/vinum base-obsolete obsolete
|
||||
./sbin/wdogctl base-sysutil-root
|
||||
./sbin/wsconsctl base-sysutil-root
|
||||
./sbin/zpool base-zfs-bin zfs
|
||||
./sbin/zfs base-zfs-bin zfs
|
||||
./stand base-sys-root
|
||||
./tmp base-sys-root
|
||||
./usr base-sys-root
|
||||
|
|
@ -667,6 +669,7 @@
|
|||
./usr/bin/zgrep base-util-bin
|
||||
./usr/bin/zmore base-util-bin
|
||||
./usr/bin/znew base-util-bin
|
||||
./usr/bin/ztest base-zfs-bin zfs
|
||||
./usr/games base-games-usr
|
||||
./usr/games/hide base-games-usr
|
||||
./usr/include base-c-usr
|
||||
|
|
@ -1329,6 +1332,7 @@
|
|||
./usr/sbin/ypxfr base-nis-bin yp
|
||||
./usr/sbin/zdump base-sysutil-bin
|
||||
./usr/sbin/zic base-sysutil-bin
|
||||
./usr/sbin/zdb base-zfs-bin zfs
|
||||
./usr/share base-sys-share
|
||||
./usr/share/atf base-atf-share
|
||||
./usr/share/atf/atf-run.hooks base-atf-bin share
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: shl.mi,v 1.496 2009/10/05 03:54:17 tsarna Exp $
|
||||
# $NetBSD: shl.mi,v 1.497 2009/10/05 22:32:58 haad Exp $
|
||||
#
|
||||
# Note: Don't delete entries from here - mark them as "obsolete" instead,
|
||||
# unless otherwise stated below.
|
||||
|
|
@ -55,6 +55,12 @@
|
|||
./usr/lib/libamu.so.4.0 base-amd-shlib
|
||||
./usr/lib/libarchive.so.3.0 base-sys-shlib
|
||||
./usr/lib/libasn1.so.8.0 base-krb5-shlib kerberos
|
||||
./usr/lib/libavl.so base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libavl.so.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libavl.so.0.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libavl.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libavl_p.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libavl_pic.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libbfd.so.10.0 base-sys-shlib binutils=216
|
||||
./usr/lib/libbfd.so.11.0 base-sys-shlib binutils=219
|
||||
./usr/lib/libbind9.so.4.0 base-bind-shlib
|
||||
|
|
@ -100,6 +106,12 @@
|
|||
./usr/lib/libmagic.so.3.0 base-sys-shlib
|
||||
./usr/lib/libmenu.so.6.0 base-sys-shlib
|
||||
./usr/lib/libnetpgp.so.2.0 base-crypto-shlib crypto
|
||||
./usr/lib/libnvpair.so base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libnvpair.so.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libnvpair.so.0.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libnvpair.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libnvpair_p.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libnvpair_pic.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libobjc.so.2.0 base-sys-shlib gcc=3
|
||||
./usr/lib/libobjc.so.3.0 base-sys-shlib gcc=4
|
||||
./usr/lib/libopenpgpsdk.so.0.9 base-obsolete obsolete
|
||||
|
|
@ -162,10 +174,34 @@
|
|||
./usr/lib/libtermcap.so.0.6 base-sys-shlib
|
||||
./usr/lib/libtermlib.so.0.6 base-sys-shlib
|
||||
./usr/lib/libukfs.so.1.0 base-sys-shlib
|
||||
./usr/lib/libumem.so base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libumem.so.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libumem.so.0.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libumem.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libumem_p.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libumem_pic.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libusbhid.so.1.0 base-sys-shlib
|
||||
./usr/lib/libutil.so.7.17 base-sys-shlib
|
||||
./usr/lib/libuutil.so base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libuutil.so.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libuutil.so.0.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libuutil.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libuutil_p.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libuutil_pic.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libwrap.so.1.0 base-net-shlib
|
||||
./usr/lib/libz.so.1.0 base-sys-shlib
|
||||
./usr/lib/libzfs.so base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzfs.so.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzfs.so.0.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzfs.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzfs_p.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzfs_pic.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzpool.so base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzpool.so.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzpool.so.0.0 base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzpool.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzpool_p.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/libzpool_pic.a base-zfs-shlib zfs,dynamicroot
|
||||
./usr/lib/nss_mdns.so.0 base-mdns-shlib mdns
|
||||
./usr/lib/security/pam_afslog.so.3 base-sys-shlib kerberos,pam
|
||||
./usr/lib/security/pam_chroot.so.3 base-sys-shlib pam
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.1161 2009/10/02 15:09:16 nakayama Exp $
|
||||
# $NetBSD: mi,v 1.1162 2009/10/05 22:32:58 haad Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -2740,6 +2740,9 @@
|
|||
./usr/share/man/cat8/zdump.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/zic.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/zzz.0 man-sysutil-catman .cat
|
||||
./usr/share/man/cat8/zdb.0 man-zfs-man zfs
|
||||
./usr/share/man/cat8/zfs.0 man-zfs-man zfs
|
||||
./usr/share/man/cat8/zpool.0 man-zfs-man zfs
|
||||
./usr/share/man/cat9/boot.0 man-obsolete obsolete
|
||||
./usr/share/man/html1/Mail.html man-mail-htmlman html
|
||||
./usr/share/man/html1/[.html man-util-htmlman html
|
||||
|
|
@ -5058,6 +5061,9 @@
|
|||
./usr/share/man/html8/zdump.html man-sysutil-htmlman html
|
||||
./usr/share/man/html8/zic.html man-sysutil-htmlman html
|
||||
./usr/share/man/html8/zzz.html man-sysutil-htmlman html
|
||||
./usr/share/man/html8/zdb.html man-zfs-man zfs
|
||||
./usr/share/man/html8/zfs.html man-zfs-man zfs
|
||||
./usr/share/man/html8/zpool.html man-zfs-man zfs
|
||||
./usr/share/man/man1/Mail.1 man-mail-man .man
|
||||
./usr/share/man/man1/[.1 man-util-man .man
|
||||
./usr/share/man/man1/alias.1 man-util-man .man
|
||||
|
|
@ -7758,6 +7764,9 @@
|
|||
./usr/share/man/man8/yptest.8 man-nis-man yp,.man
|
||||
./usr/share/man/man8/ypxfr.8 man-nis-man yp,.man
|
||||
./usr/share/man/man8/zdump.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/zdb.8 man-zfs-man zfs
|
||||
./usr/share/man/man8/zfs.8 man-zfs-man zfs
|
||||
./usr/share/man/man8/zpool.8 man-zfs-man zfs
|
||||
./usr/share/man/man8/zic.8 man-sysutil-man .man
|
||||
./usr/share/man/man8/zzz.8 man-sysutil-man .man
|
||||
./usr/share/man/man9/boot.9 man-obsolete obsolete
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.3 2009/10/02 18:50:15 elad Exp $
|
||||
# $NetBSD: mi,v 1.4 2009/10/05 22:32:58 haad Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -96,6 +96,8 @@
|
|||
./@MODULEDIR@/securelevel/securelevel.kmod base-kernel-modules kmod
|
||||
./@MODULEDIR@/smbfs base-kernel-modules kmod
|
||||
./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules kmod
|
||||
./@MODULEDIR@/solaris base-kernel-modules kmod,zfs
|
||||
./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,zfs
|
||||
./@MODULEDIR@/suser base-kernel-modules kmod
|
||||
./@MODULEDIR@/suser/suser.kmod base-kernel-modules kmod
|
||||
./@MODULEDIR@/sysvbfs base-kernel-modules kmod
|
||||
|
|
@ -112,3 +114,5 @@
|
|||
./@MODULEDIR@/union/union.kmod base-kernel-modules kmod
|
||||
./@MODULEDIR@/vnd base-kernel-modules kmod
|
||||
./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod
|
||||
./@MODULEDIR@/zfs base-kernel-modules kmod,zfs
|
||||
./@MODULEDIR@/zfs/zfs.kmod base-kernel-modules kmod,zfs
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.README,v 1.253 2009/09/29 23:56:34 tsarna Exp $
|
||||
# $NetBSD: bsd.README,v 1.254 2009/10/05 22:32:58 haad Exp $
|
||||
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
|
||||
|
||||
This is the README file for the make "include" files for the NetBSD
|
||||
|
|
@ -339,6 +339,11 @@ MKYP If "no", disables building of YP (NIS)
|
|||
infrastructure (libraries and support programs).
|
||||
Default: yes
|
||||
|
||||
MKZFS If "no", do not build and install utilities and libraries
|
||||
used to manage ZFS file system. Do not build zfs and solaris
|
||||
compatibility kernel modules.
|
||||
Default: no
|
||||
|
||||
USE_HESIOD If "no", disables building Hesiod support into
|
||||
various system utilities/libraries that support it.
|
||||
If ${MKHESIOD} is "no", USE_HESIOD will also be
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: bsd.own.mk,v 1.584 2009/10/01 09:12:44 skrll Exp $
|
||||
# $NetBSD: bsd.own.mk,v 1.585 2009/10/05 22:32:58 haad Exp $
|
||||
|
||||
.if !defined(_BSD_OWN_MK_)
|
||||
_BSD_OWN_MK_=1
|
||||
|
|
@ -701,7 +701,7 @@ ${var}?= yes
|
|||
#
|
||||
.for var in \
|
||||
MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
|
||||
MKLVM \
|
||||
MKLVM MKZFS \
|
||||
MKMANZ MKOBJDIRS \
|
||||
MKPCC MKPCCCMDS \
|
||||
MKSOFTFLOAT MKSTRIPIDENT \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.33 2009/10/02 18:50:12 elad Exp $
|
||||
# $NetBSD: Makefile,v 1.34 2009/10/05 22:32:58 haad Exp $
|
||||
|
||||
# For all platforms
|
||||
|
||||
|
|
@ -102,4 +102,10 @@ SUBDIR+= viadrm
|
|||
SUBDIR+= dm
|
||||
.endif
|
||||
|
||||
# we need solaris and zfs modules for ZFS
|
||||
.if (${MKZFS} != "no")
|
||||
SUBDIR+= solaris
|
||||
SUBDIR+= zfs
|
||||
.endif
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
|
|
|||
Loading…
Reference in New Issue