diff --git a/config/deb.am b/config/deb.am index 3e9a93797..33e252022 100644 --- a/config/deb.am +++ b/config/deb.am @@ -57,22 +57,21 @@ deb-utils: deb-local rpm-utils-initramfs debarch=`$(DPKG) --print-architecture`; \ pkg1=$${name}-$${version}.$${arch}.rpm; \ pkg2=libnvpair3-$${version}.$${arch}.rpm; \ - pkg3=libuutil3-$${version}.$${arch}.rpm; \ - pkg4=libzfs7-$${version}.$${arch}.rpm; \ - pkg5=libzpool7-$${version}.$${arch}.rpm; \ - pkg6=libzfs7-devel-$${version}.$${arch}.rpm; \ - pkg7=$${name}-test-$${version}.$${arch}.rpm; \ - pkg8=$${name}-dracut-$${version}.noarch.rpm; \ - pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \ - pkg10=`ls python3-pyzfs-$${version}.noarch.rpm 2>/dev/null`; \ - pkg11=`ls pam_zfs_key-$${version}.$${arch}.rpm 2>/dev/null`; \ + pkg3=libzfs7-$${version}.$${arch}.rpm; \ + pkg4=libzpool7-$${version}.$${arch}.rpm; \ + pkg5=libzfs7-devel-$${version}.$${arch}.rpm; \ + pkg6=$${name}-test-$${version}.$${arch}.rpm; \ + pkg7=$${name}-dracut-$${version}.noarch.rpm; \ + pkg8=$${name}-initramfs-$${version}.$${arch}.rpm; \ + pkg9=`ls python3-pyzfs-$${version}.noarch.rpm 2>/dev/null`; \ + pkg10=`ls pam_zfs_key-$${version}.$${arch}.rpm 2>/dev/null`; \ ## Arguments need to be passed to dh_shlibdeps. Alien provides no mechanism ## to do this, so we install a shim onto the path which calls the real ## dh_shlibdeps with the required arguments. path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \ echo "#!$(SHELL)" > $${path_prepend}/dh_shlibdeps; \ echo "`which dh_shlibdeps` -- \ - -xlibuutil3linux -xlibnvpair3linux -xlibzfs7linux -xlibzpool7linux" \ + -xlibnvpair3linux -xlibzfs7linux -xlibzpool7linux" \ >> $${path_prepend}/dh_shlibdeps; \ ## These -x arguments are passed to dpkg-shlibdeps, which exclude the ## Debianized packages from the auto-generated dependencies of the new debs, diff --git a/contrib/debian/Makefile.am b/contrib/debian/Makefile.am index 3c2198560..6dafc90fd 100644 --- a/contrib/debian/Makefile.am +++ b/contrib/debian/Makefile.am @@ -10,8 +10,6 @@ dist_noinst_DATA += %D%/openzfs-libnvpair3.install.in dist_noinst_DATA += %D%/openzfs-libpam-zfs.install dist_noinst_DATA += %D%/openzfs-libpam-zfs.postinst dist_noinst_DATA += %D%/openzfs-libpam-zfs.prerm -dist_noinst_DATA += %D%/openzfs-libuutil3.docs -dist_noinst_DATA += %D%/openzfs-libuutil3.install.in dist_noinst_DATA += %D%/openzfs-libzfs7.docs dist_noinst_DATA += %D%/openzfs-libzfs7.install.in dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.docs diff --git a/contrib/debian/clean b/contrib/debian/clean index caabcd30c..65c0680c5 100644 --- a/contrib/debian/clean +++ b/contrib/debian/clean @@ -5,7 +5,6 @@ contrib/pyzfs/libzfs_core/__pycache__/ contrib/pyzfs/libzfs_core/bindings/__pycache__/ contrib/pyzfs/pyzfs.egg-info/ debian/openzfs-libnvpair3.install -debian/openzfs-libuutil3.install debian/openzfs-libzfs7.install debian/openzfs-libzfs-dev.install debian/openzfs-libzpool7.install diff --git a/contrib/debian/control b/contrib/debian/control index a886c2e86..3274217a8 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -55,42 +55,23 @@ Description: PAM module for managing encryption keys for ZFS This provides a Pluggable Authentication Module (PAM) that automatically unlocks encrypted ZFS datasets upon login. -Package: openzfs-libuutil3 -Section: contrib/libs -Architecture: linux-any -Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: libuutil1, libuutil3 -Replaces: libuutil1, libuutil3, libuutil3linux -Conflicts: libuutil3linux -Description: Solaris userland utility library for Linux - This library provides a variety of glue functions for ZFS on Linux: - * libspl: The Solaris Porting Layer userland library, which provides APIs - that make it possible to run Solaris user code in a Linux environment - with relatively minimal modification. - * libavl: The Adelson-Velskii Landis balanced binary tree manipulation - library. - * libefi: The Extensible Firmware Interface library for GUID disk - partitioning. - * libshare: NFS, SMB, and iSCSI service integration for ZFS. - Package: openzfs-libzfs-dev Section: contrib/libdevel Architecture: linux-any Depends: libssl-dev | libssl1.0-dev, openzfs-libnvpair3 (= ${binary:Version}), - openzfs-libuutil3 (= ${binary:Version}), openzfs-libzfs7 (= ${binary:Version}), openzfs-libzfsbootenv1 (= ${binary:Version}), openzfs-libzpool7 (= ${binary:Version}), ${misc:Depends} Replaces: libzfslinux-dev Conflicts: libzfslinux-dev -Provides: libnvpair-dev, libuutil-dev +Provides: libnvpair-dev Description: OpenZFS filesystem development files for Linux Header files and static libraries for compiling software against libraries of OpenZFS filesystem. . - This package includes the development files of libnvpair3, libuutil3, + This package includes the development files of libnvpair3, libzpool7 and libzfs7. Package: openzfs-libzfs7 @@ -246,7 +227,6 @@ Section: contrib/admin Architecture: linux-any Pre-Depends: ${misc:Pre-Depends} Depends: openzfs-libnvpair3 (= ${binary:Version}), - openzfs-libuutil3 (= ${binary:Version}), openzfs-libzfs7 (= ${binary:Version}), openzfs-libzpool7 (= ${binary:Version}), python3, diff --git a/contrib/debian/openzfs-libuutil3.docs b/contrib/debian/openzfs-libuutil3.docs deleted file mode 100644 index 4302f1b2a..000000000 --- a/contrib/debian/openzfs-libuutil3.docs +++ /dev/null @@ -1,2 +0,0 @@ -COPYRIGHT -LICENSE diff --git a/contrib/debian/openzfs-libuutil3.install.in b/contrib/debian/openzfs-libuutil3.install.in deleted file mode 100644 index bb3338679..000000000 --- a/contrib/debian/openzfs-libuutil3.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libuutil.so.* diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in index 9ae479aeb..fa89f9d2a 100644 --- a/rpm/generic/zfs.spec.in +++ b/rpm/generic/zfs.spec.in @@ -113,7 +113,6 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libzpool7%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release} -Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release} Requires: %{name}-kmod = %{version} Provides: %{name}-kmod-common = %{version}-%{release} @@ -199,29 +198,6 @@ to write self describing data structures on disk. %postun -n libnvpair3 -p /sbin/ldconfig %endif -%package -n libuutil3 -Summary: Solaris userland utility library for Linux -Group: System Environment/Kernel -Obsoletes: libuutil1 <= %{version} - -%description -n libuutil3 -This library provides a variety of compatibility functions for OpenZFS: - * libspl: The Solaris Porting Layer userland library, which provides APIs - that make it possible to run Solaris user code in a Linux environment - with relatively minimal modification. - * libavl: The Adelson-Velskii Landis balanced binary tree manipulation - library. - * libefi: The Extensible Firmware Interface library for GUID disk - partitioning. - * libshare: NFS, SMB, and iSCSI service integration for ZFS. - -%if %{defined ldconfig_scriptlets} -%ldconfig_scriptlets -n libuutil3 -%else -%post -n libuutil3 -p /sbin/ldconfig -%postun -n libuutil3 -p /sbin/ldconfig -%endif - # The library version is encoded in the package name. When updating the # version information it is important to add an obsoletes line below for # the previous version of the package. @@ -249,10 +225,8 @@ Group: System Environment/Kernel Requires: libzfs7%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release} -Requires: libuutil3%{?_isa} = %{version}-%{release} Provides: libzpool7-devel = %{version}-%{release} Provides: libnvpair3-devel = %{version}-%{release} -Provides: libuutil3-devel = %{version}-%{release} Obsoletes: zfs-devel <= %{version} Obsoletes: libzfs2-devel <= %{version} Obsoletes: libzfs4-devel <= %{version} @@ -556,9 +530,6 @@ systemctl --system daemon-reload >/dev/null || true %files -n libnvpair3 %{_libdir}/libnvpair.so.* -%files -n libuutil3 -%{_libdir}/libuutil.so.* - %files -n libzfs7 %{_libdir}/libzfs*.so.*