Mercurial Mercurial > upstream > illumos > illumos-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6354489 libzfs.so should deliver in /lib
authoreschrock
Sun, 27 Nov 2005 15:46:25 -0800
changeset 998 d84ba40739f6
parent 997 72cb91306495
child 999 e4fc41bb3bfb
6354489 libzfs.so should deliver in /lib
usr/src/Targetdirs file | annotate | diff | comparison | revisions
usr/src/lib/libzfs/Makefile.com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWzfsr/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWzfsr/prototype_i386 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWzfsr/prototype_sparc file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWzfsu/prototype_com file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWzfsu/prototype_i386 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/SUNWzfsu/prototype_sparc file | annotate | diff | comparison | revisions
usr/src/pkgdefs/etc/exception_list_i386 file | annotate | diff | comparison | revisions
usr/src/pkgdefs/etc/exception_list_sparc file | annotate | diff | comparison | revisions 
--- a/usr/src/Targetdirs	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/Targetdirs	Sun Nov 27 15:46:25 2005 -0800
@@ -877,6 +877,8 @@
 $(ROOT)/usr/lib/libw.so:=		REALPATH=../../lib/libw.so.1
 $(ROOT)/usr/lib/libxnet.so.1:=		REALPATH=../../lib/libxnet.so.1
 $(ROOT)/usr/lib/libxnet.so:=		REALPATH=../../lib/libxnet.so.1
+$(ROOT)/usr/lib/libzfs.so.1:=		REALPATH=../../lib/libzfs.so.1
+$(ROOT)/usr/lib/libzfs.so:=		REALPATH=../../lib/libzfs.so.1
 $(ROOT)/usr/lib/llib-ladm.ln:=		REALPATH=../../lib/llib-ladm.ln
 $(ROOT)/usr/lib/llib-ladm:=		REALPATH=../../lib/llib-ladm
 $(ROOT)/usr/lib/llib-laio.ln:=		REALPATH=../../lib/llib-laio.ln
@@ -971,6 +973,8 @@
 $(ROOT)/usr/lib/llib-luuid:=		REALPATH=../../lib/llib-luuid
 $(ROOT)/usr/lib/llib-lxnet.ln:=		REALPATH=../../lib/llib-lxnet.ln
 $(ROOT)/usr/lib/llib-lxnet:=		REALPATH=../../lib/llib-lxnet
+$(ROOT)/usr/lib/llib-lzfs.ln:=		REALPATH=../../lib/llib-lzfs.ln
+$(ROOT)/usr/lib/llib-lzfs:=		REALPATH=../../lib/llib-lzfs
 $(ROOT)/usr/lib/nss_compat.so.1:=	REALPATH=../../lib/nss_compat.so.1
 $(ROOT)/usr/lib/nss_dns.so.1:=		REALPATH=../../lib/nss_dns.so.1
 $(ROOT)/usr/lib/nss_files.so.1:=	REALPATH=../../lib/nss_files.so.1
@@ -1192,6 +1196,10 @@
 	REALPATH=../../../lib/$(MACH64)/libxnet.so.1
 $(ROOT)/usr/lib/$(MACH64)/libxnet.so:= \
 	REALPATH=../../../lib/$(MACH64)/libxnet.so.1
+$(ROOT)/usr/lib/$(MACH64)/libzfs.so:= \
+	REALPATH=../../../lib/$(MACH64)/libzfs.so.1
+$(ROOT)/usr/lib/$(MACH64)/libzfs.so.1:= \
+	REALPATH=../../../lib/$(MACH64)/libzfs.so.1
 $(ROOT)/usr/lib/$(MACH64)/llib-ladm.ln:= \
 	REALPATH=../../../lib/$(MACH64)/llib-ladm.ln
 $(ROOT)/usr/lib/$(MACH64)/llib-laio.ln:= \
@@ -1284,6 +1292,8 @@
 	REALPATH=../../../lib/$(MACH64)/llib-luuid.ln
 $(ROOT)/usr/lib/$(MACH64)/llib-lxnet.ln:= \
 	REALPATH=../../../lib/$(MACH64)/llib-lxnet.ln
+$(ROOT)/usr/lib/$(MACH64)/llib-lzfs.ln:= \
+	REALPATH=../../../lib/$(MACH64)/llib-lzfs.ln
 $(ROOT)/usr/lib/$(MACH64)/nss_compat.so.1:= \
 	REALPATH=../../../lib/$(MACH64)/nss_compat.so.1
 $(ROOT)/usr/lib/$(MACH64)/nss_dns.so.1:= \
@@ -1424,6 +1434,8 @@
 	/usr/lib/libw.so.1 \
 	/usr/lib/libxnet.so \
 	/usr/lib/libxnet.so.1 \
+	/usr/lib/libzfs.so \
+	/usr/lib/libzfs.so.1 \
 	/usr/lib/llib-ladm \
 	/usr/lib/llib-ladm.ln \
 	/usr/lib/llib-laio \
@@ -1518,6 +1530,8 @@
 	/usr/lib/llib-luuid.ln \
 	/usr/lib/llib-lxnet \
 	/usr/lib/llib-lxnet.ln \
+	/usr/lib/llib-lzfs \
+	/usr/lib/llib-lzfs.ln \
 	/usr/lib/nss_compat.so.1 \
 	/usr/lib/nss_dns.so.1 \
 	/usr/lib/nss_files.so.1 \
@@ -1643,6 +1657,8 @@
 	/usr/lib/$(MACH64)/libw.so.1 \
 	/usr/lib/$(MACH64)/libxnet.so \
 	/usr/lib/$(MACH64)/libxnet.so.1 \
+	/usr/lib/$(MACH64)/libzfs.so \
+	/usr/lib/$(MACH64)/libzfs.so.1 \
 	/usr/lib/$(MACH64)/llib-ladm.ln \
 	/usr/lib/$(MACH64)/llib-laio.ln \
 	/usr/lib/$(MACH64)/llib-lavl.ln \
@@ -1689,6 +1705,7 @@
 	/usr/lib/$(MACH64)/llib-lumem.ln \
 	/usr/lib/$(MACH64)/llib-luuid.ln \
 	/usr/lib/$(MACH64)/llib-lxnet.ln \
+	/usr/lib/$(MACH64)/llib-lzfs.ln \
 	/usr/lib/$(MACH64)/nss_compat.so.1 \
 	/usr/lib/$(MACH64)/nss_dns.so.1 \
 	/usr/lib/$(MACH64)/nss_files.so.1 \
--- a/usr/src/lib/libzfs/Makefile.com	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/lib/libzfs/Makefile.com	Sun Nov 27 15:46:25 2005 -0800
@@ -36,6 +36,9 @@
 
 include ../../Makefile.lib
 
+# libzfs must be installed in the root filesystem for mount(1M)
+include ../../Makefile.rootfs
+
 LIBS=	$(DYNLIB) $(LINTLIB)
 
 INCS += -I$(SRCDIR)
--- a/usr/src/pkgdefs/SUNWzfsr/prototype_com	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_com	Sun Nov 27 15:46:25 2005 -0800
@@ -45,6 +45,9 @@
 d none kernel/drv 755 root sys
 f none kernel/drv/zfs.conf 644 root sys
 d none kernel/fs 755 root sys
+d none lib 755 root bin
+s none lib/libzfs.so=libzfs.so.1
+f none lib/libzfs.so.1 755 root bin
 d none sbin 755 root sys
 f none sbin/zfs 555 root bin
 f none sbin/zpool 555 root bin
--- a/usr/src/pkgdefs/SUNWzfsr/prototype_i386	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_i386	Sun Nov 27 15:46:25 2005 -0800
@@ -40,3 +40,6 @@
 f none kernel/kmdb/zfs 555 root sys
 d none kernel/kmdb/amd64 755 root sys
 f none kernel/kmdb/amd64/zfs 555 root sys
+d none lib/amd64 755 root bin
+s none lib/amd64/libzfs.so=libzfs.so.1
+f none lib/amd64/libzfs.so.1 755 root bin
--- a/usr/src/pkgdefs/SUNWzfsr/prototype_sparc	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_sparc	Sun Nov 27 15:46:25 2005 -0800
@@ -37,4 +37,6 @@
 l none kernel/fs/sparcv9/zfs=../../../kernel/drv/sparcv9/zfs
 d none kernel/kmdb/sparcv9 755 root sys
 f none kernel/kmdb/sparcv9/zfs 555 root sys
-
+d none lib/sparcv9 755 root bin
+s none lib/sparcv9/libzfs.so=libzfs.so.1
+f none lib/sparcv9/libzfs.so.1 755 root bin
--- a/usr/src/pkgdefs/SUNWzfsu/prototype_com	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_com	Sun Nov 27 15:46:25 2005 -0800
@@ -46,8 +46,8 @@
 f none usr/lib/fs/zfs/fstyp 555 root bin
 s none usr/lib/fs/zfs/mount=../../../../sbin/zfs
 s none usr/lib/fs/zfs/umount=../../../../sbin/zfs
-f none usr/lib/libzfs.so.1 755 root bin
-s none usr/lib/libzfs.so=libzfs.so.1
+s none usr/lib/libzfs.so.1=../../lib/libzfs.so.1
+s none usr/lib/libzfs.so=../../lib/libzfs.so.1
 f none usr/lib/libzfs_jni.so.1 755 root bin
 s none usr/lib/libzfs_jni.so=libzfs_jni.so.1
 d none usr/lib/mdb 755 root sys
--- a/usr/src/pkgdefs/SUNWzfsu/prototype_i386	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_i386	Sun Nov 27 15:46:25 2005 -0800
@@ -32,8 +32,8 @@
 # SUNWzfsu
 #
 d none usr/lib/amd64 755 root bin
-f none usr/lib/amd64/libzfs.so.1 755 root bin
-s none usr/lib/amd64/libzfs.so=libzfs.so.1
+s none usr/lib/amd64/libzfs.so.1=../../../lib/amd64/libzfs.so.1
+s none usr/lib/amd64/libzfs.so=../../../lib/amd64/libzfs.so.1
 f none usr/lib/amd64/libzfs_jni.so.1 755 root bin
 s none usr/lib/amd64/libzfs_jni.so=libzfs_jni.so.1
 f none usr/lib/amd64/libzpool.so.1 755 root bin
--- a/usr/src/pkgdefs/SUNWzfsu/prototype_sparc	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_sparc	Sun Nov 27 15:46:25 2005 -0800
@@ -36,8 +36,8 @@
 d none usr/lib/mdb/proc/sparcv9 755 root sys
 f none usr/lib/mdb/proc/sparcv9/libzpool.so 555 root sys
 d none usr/lib/sparcv9 755 root bin
-f none usr/lib/sparcv9/libzfs.so.1 755 root bin
-s none usr/lib/sparcv9/libzfs.so=libzfs.so.1
+s none usr/lib/sparcv9/libzfs.so.1=../../../lib/sparcv9/libzfs.so.1
+s none usr/lib/sparcv9/libzfs.so=../../../lib/sparcv9/libzfs.so.1
 f none usr/lib/sparcv9/libzfs_jni.so.1 755 root bin
 s none usr/lib/sparcv9/libzfs_jni.so=libzfs_jni.so.1
 f none usr/lib/sparcv9/libzpool.so.1 755 root bin
--- a/usr/src/pkgdefs/etc/exception_list_i386	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/etc/exception_list_i386	Sun Nov 27 15:46:25 2005 -0800
@@ -736,6 +736,9 @@
 #
 # ZFS internal tools and lint libraries
 #
+lib/llib-lzfs.ln			i386
+lib/llib-lzfs				i386
+lib/amd64/llib-lzfs.ln			i386
 usr/bin/ztest				i386
 usr/bin/i86/ztest			i386
 usr/bin/amd64/ztest			i386
--- a/usr/src/pkgdefs/etc/exception_list_sparc	Sat Nov 26 13:39:08 2005 -0800
+++ b/usr/src/pkgdefs/etc/exception_list_sparc	Sun Nov 27 15:46:25 2005 -0800
@@ -804,6 +804,9 @@
 #
 # ZFS internal tools and lint libraries
 #
+lib/llib-lzfs				sparc
+lib/llib-lzfs.ln			sparc
+lib/sparcv9/llib-lzfs.ln		sparc
 usr/bin/ztest				sparc
 usr/bin/sparcv9/ztest			sparc
 usr/lib/llib-lzfs			sparc
upstream/illumos/illumos-gate