summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authoreschrock <none@none>2005-11-27 15:46:25 -0800
committereschrock <none@none>2005-11-27 15:46:25 -0800
commit64dbca9e47a5b508a6b6994fd8c3b903027ef952 (patch)
tree2050e924a756d565ce03a16369b41902d7a497cf /usr/src
parent04eaf6a4e09fd975f47e6af902cbea173896d06c (diff)
downloadillumos-joyent-64dbca9e47a5b508a6b6994fd8c3b903027ef952.tar.gz
6354489 libzfs.so should deliver in /lib
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/Targetdirs17
-rw-r--r--usr/src/lib/libzfs/Makefile.com3
-rw-r--r--usr/src/pkgdefs/SUNWzfsr/prototype_com3
-rw-r--r--usr/src/pkgdefs/SUNWzfsr/prototype_i3863
-rw-r--r--usr/src/pkgdefs/SUNWzfsr/prototype_sparc4
-rw-r--r--usr/src/pkgdefs/SUNWzfsu/prototype_com4
-rw-r--r--usr/src/pkgdefs/SUNWzfsu/prototype_i3864
-rw-r--r--usr/src/pkgdefs/SUNWzfsu/prototype_sparc4
-rw-r--r--usr/src/pkgdefs/etc/exception_list_i3863
-rw-r--r--usr/src/pkgdefs/etc/exception_list_sparc3
10 files changed, 41 insertions, 7 deletions
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index 98ef5c6f3a..891c906a2f 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -877,6 +877,8 @@ $(ROOT)/usr/lib/libw.so.1:= REALPATH=../../lib/libw.so.1
$(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.ln:= REALPATH=../../lib/llib-luuid.ln
$(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 @@ $(ROOT)/usr/lib/$(MACH64)/libxnet.so.1:= \
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 @@ $(ROOT)/usr/lib/$(MACH64)/llib-luuid.ln:= \
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 @@ SYM.USRLIB= \
/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 @@ SYM.USRLIB= \
/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 @@ SYM.USRLIB64= \
/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 @@ SYM.USRLIB64= \
/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 \
diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com
index f8d17fbf1a..869da5228b 100644
--- a/usr/src/lib/libzfs/Makefile.com
+++ b/usr/src/lib/libzfs/Makefile.com
@@ -36,6 +36,9 @@ OBJECTS= $(OBJS_COMMON) $(OBJS_SHARED)
include ../../Makefile.lib
+# libzfs must be installed in the root filesystem for mount(1M)
+include ../../Makefile.rootfs
+
LIBS= $(DYNLIB) $(LINTLIB)
INCS += -I$(SRCDIR)
diff --git a/usr/src/pkgdefs/SUNWzfsr/prototype_com b/usr/src/pkgdefs/SUNWzfsr/prototype_com
index ff884b96eb..738418666e 100644
--- a/usr/src/pkgdefs/SUNWzfsr/prototype_com
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_com
@@ -45,6 +45,9 @@ d none kernel/kmdb 755 root sys
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
diff --git a/usr/src/pkgdefs/SUNWzfsr/prototype_i386 b/usr/src/pkgdefs/SUNWzfsr/prototype_i386
index 152f73c491..66cae02b57 100644
--- a/usr/src/pkgdefs/SUNWzfsr/prototype_i386
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_i386
@@ -40,3 +40,6 @@ l none kernel/fs/amd64/zfs=../../../kernel/drv/amd64/zfs
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
diff --git a/usr/src/pkgdefs/SUNWzfsr/prototype_sparc b/usr/src/pkgdefs/SUNWzfsr/prototype_sparc
index 94914a9e5f..807b748ae0 100644
--- a/usr/src/pkgdefs/SUNWzfsr/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWzfsr/prototype_sparc
@@ -37,4 +37,6 @@ d none kernel/fs/sparcv9 755 root sys
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
diff --git a/usr/src/pkgdefs/SUNWzfsu/prototype_com b/usr/src/pkgdefs/SUNWzfsu/prototype_com
index 5af24f36af..771903d2eb 100644
--- a/usr/src/pkgdefs/SUNWzfsu/prototype_com
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_com
@@ -46,8 +46,8 @@ d none usr/lib/fs/zfs 755 root sys
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
diff --git a/usr/src/pkgdefs/SUNWzfsu/prototype_i386 b/usr/src/pkgdefs/SUNWzfsu/prototype_i386
index 7ba736791c..988cb0b6fb 100644
--- a/usr/src/pkgdefs/SUNWzfsu/prototype_i386
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_i386
@@ -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
diff --git a/usr/src/pkgdefs/SUNWzfsu/prototype_sparc b/usr/src/pkgdefs/SUNWzfsu/prototype_sparc
index 308a157ed4..57eb70b964 100644
--- a/usr/src/pkgdefs/SUNWzfsu/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWzfsu/prototype_sparc
@@ -36,8 +36,8 @@ f none usr/lib/mdb/kvm/sparcv9/zfs.so 555 root sys
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
diff --git a/usr/src/pkgdefs/etc/exception_list_i386 b/usr/src/pkgdefs/etc/exception_list_i386
index b9c59eb0e9..101da3eec9 100644
--- a/usr/src/pkgdefs/etc/exception_list_i386
+++ b/usr/src/pkgdefs/etc/exception_list_i386
@@ -736,6 +736,9 @@ lib/amd64/libc_i18n.a i386
#
# 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
diff --git a/usr/src/pkgdefs/etc/exception_list_sparc b/usr/src/pkgdefs/etc/exception_list_sparc
index 89c6c4299c..ed42b8f184 100644
--- a/usr/src/pkgdefs/etc/exception_list_sparc
+++ b/usr/src/pkgdefs/etc/exception_list_sparc
@@ -804,6 +804,9 @@ usr/platform/SUNW,Sun-Fire-T200/lib/llib-lpcp.ln sparc
#
# 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
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-02 01:14:27 +0000