Skip to content

Commit 9debad6

Browse files
committed
Bump SONAME of libzfs and libzpool
The ABI of libzfs and libzpool have breaking changes since the last major release. Bump the SONAME for the upcoming 2.4 release branch to libzfs7 and libzpool7. Signed-off-by: Brian Behlendorf <[email protected]> Closes #17911
1 parent 1fee78c commit 9debad6

File tree

11 files changed

+48
-46
lines changed

11 files changed

+48
-46
lines changed

config/deb.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ deb-utils: deb-local rpm-utils-initramfs
5858
pkg1=$${name}-$${version}.$${arch}.rpm; \
5959
pkg2=libnvpair3-$${version}.$${arch}.rpm; \
6060
pkg3=libuutil3-$${version}.$${arch}.rpm; \
61-
pkg4=libzfs6-$${version}.$${arch}.rpm; \
62-
pkg5=libzpool6-$${version}.$${arch}.rpm; \
63-
pkg6=libzfs6-devel-$${version}.$${arch}.rpm; \
61+
pkg4=libzfs7-$${version}.$${arch}.rpm; \
62+
pkg5=libzpool7-$${version}.$${arch}.rpm; \
63+
pkg6=libzfs7-devel-$${version}.$${arch}.rpm; \
6464
pkg7=$${name}-test-$${version}.$${arch}.rpm; \
6565
pkg8=$${name}-dracut-$${version}.noarch.rpm; \
6666
pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \
@@ -72,7 +72,7 @@ deb-utils: deb-local rpm-utils-initramfs
7272
path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \
7373
echo "#!$(SHELL)" > $${path_prepend}/dh_shlibdeps; \
7474
echo "`which dh_shlibdeps` -- \
75-
-xlibuutil3linux -xlibnvpair3linux -xlibzfs6linux -xlibzpool6linux" \
75+
-xlibuutil3linux -xlibnvpair3linux -xlibzfs7linux -xlibzpool7linux" \
7676
>> $${path_prepend}/dh_shlibdeps; \
7777
## These -x arguments are passed to dpkg-shlibdeps, which exclude the
7878
## Debianized packages from the auto-generated dependencies of the new debs,

contrib/debian/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ dist_noinst_DATA += %D%/openzfs-libpam-zfs.postinst
1212
dist_noinst_DATA += %D%/openzfs-libpam-zfs.prerm
1313
dist_noinst_DATA += %D%/openzfs-libuutil3.docs
1414
dist_noinst_DATA += %D%/openzfs-libuutil3.install.in
15-
dist_noinst_DATA += %D%/openzfs-libzfs6.docs
16-
dist_noinst_DATA += %D%/openzfs-libzfs6.install.in
15+
dist_noinst_DATA += %D%/openzfs-libzfs7.docs
16+
dist_noinst_DATA += %D%/openzfs-libzfs7.install.in
1717
dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.docs
1818
dist_noinst_DATA += %D%/openzfs-libzfsbootenv1.install.in
1919
dist_noinst_DATA += %D%/openzfs-libzfs-dev.docs
2020
dist_noinst_DATA += %D%/openzfs-libzfs-dev.install.in
21-
dist_noinst_DATA += %D%/openzfs-libzpool6.docs
22-
dist_noinst_DATA += %D%/openzfs-libzpool6.install.in
21+
dist_noinst_DATA += %D%/openzfs-libzpool7.docs
22+
dist_noinst_DATA += %D%/openzfs-libzpool7.install.in
2323
dist_noinst_DATA += %D%/openzfs-python3-pyzfs.install
2424
dist_noinst_DATA += %D%/openzfs-zfs-dkms.config
2525
dist_noinst_DATA += %D%/openzfs-zfs-dkms.dkms

contrib/debian/clean

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ contrib/pyzfs/libzfs_core/bindings/__pycache__/
66
contrib/pyzfs/pyzfs.egg-info/
77
debian/openzfs-libnvpair3.install
88
debian/openzfs-libuutil3.install
9-
debian/openzfs-libzfs6.install
9+
debian/openzfs-libzfs7.install
1010
debian/openzfs-libzfs-dev.install
11-
debian/openzfs-libzpool6.install
11+
debian/openzfs-libzpool7.install

contrib/debian/control

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ Architecture: linux-any
7979
Depends: libssl-dev | libssl1.0-dev,
8080
openzfs-libnvpair3 (= ${binary:Version}),
8181
openzfs-libuutil3 (= ${binary:Version}),
82-
openzfs-libzfs6 (= ${binary:Version}),
82+
openzfs-libzfs7 (= ${binary:Version}),
8383
openzfs-libzfsbootenv1 (= ${binary:Version}),
84-
openzfs-libzpool6 (= ${binary:Version}),
84+
openzfs-libzpool7 (= ${binary:Version}),
8585
${misc:Depends}
8686
Replaces: libzfslinux-dev
8787
Conflicts: libzfslinux-dev
@@ -91,18 +91,18 @@ Description: OpenZFS filesystem development files for Linux
9191
libraries of OpenZFS filesystem.
9292
.
9393
This package includes the development files of libnvpair3, libuutil3,
94-
libzpool6 and libzfs6.
94+
libzpool7 and libzfs7.
9595

96-
Package: openzfs-libzfs6
96+
Package: openzfs-libzfs7
9797
Section: contrib/libs
9898
Architecture: linux-any
9999
Depends: ${misc:Depends}, ${shlibs:Depends}
100100
# The libcurl4 is loaded through dlopen("libcurl.so.4").
101101
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
102102
Recommends: libcurl4
103-
Breaks: libzfs2, libzfs4, libzfs4linux, libzfs6linux, openzfs-libzfs4
104-
Replaces: libzfs2, libzfs4, libzfs4linux, libzfs6linux, openzfs-libzfs4
105-
Conflicts: libzfs6linux
103+
Breaks: libzfs2, libzfs4, libzfs4linux, libzfs6linux, libzfs7linux, openzfs-libzfs4, openzfs-libzfs6
104+
Replaces: libzfs2, libzfs4, libzfs4linux, libzfs6linux, libzfs7linux, openzfs-libzfs4, openzfs-libzfs6
105+
Conflicts: libzfs7linux
106106
Description: OpenZFS filesystem library for Linux - general support
107107
OpenZFS is a storage platform that encompasses the functionality of
108108
traditional filesystems and volume managers. It supports data checksums,
@@ -124,13 +124,13 @@ Description: OpenZFS filesystem library for Linux - label info support
124124
.
125125
The zfsbootenv library provides support for modifying ZFS label information.
126126

127-
Package: openzfs-libzpool6
127+
Package: openzfs-libzpool7
128128
Section: contrib/libs
129129
Architecture: linux-any
130130
Depends: ${misc:Depends}, ${shlibs:Depends}
131-
Breaks: libzpool2, libzpool5, libzpool6linux
132-
Replaces: libzpool2, libzpool5, libzpool6linux
133-
Conflicts: libzpool6linux
131+
Breaks: libzpool2, libzpool5, libzpool6linux, libzpool7linux
132+
Replaces: libzpool2, libzpool5, libzpool6linux, libzpool7linux
133+
Conflicts: libzpool7linux
134134
Description: OpenZFS pool library for Linux
135135
OpenZFS is a storage platform that encompasses the functionality of
136136
traditional filesystems and volume managers. It supports data checksums,
@@ -247,8 +247,8 @@ Architecture: linux-any
247247
Pre-Depends: ${misc:Pre-Depends}
248248
Depends: openzfs-libnvpair3 (= ${binary:Version}),
249249
openzfs-libuutil3 (= ${binary:Version}),
250-
openzfs-libzfs6 (= ${binary:Version}),
251-
openzfs-libzpool6 (= ${binary:Version}),
250+
openzfs-libzfs7 (= ${binary:Version}),
251+
openzfs-libzpool7 (= ${binary:Version}),
252252
python3,
253253
${misc:Depends},
254254
${shlibs:Depends}
File renamed without changes.
File renamed without changes.

lib/libzfs/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if BUILD_FREEBSD
7070
libzfs_la_LIBADD += -lutil -lgeom
7171
endif
7272

73-
libzfs_la_LDFLAGS += -version-info 6:0:0
73+
libzfs_la_LDFLAGS += -version-info 7:0:0
7474

7575
pkgconfig_DATA += %D%/libzfs.pc
7676

lib/libzpool/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ if BUILD_FREEBSD
212212
libzpool_la_LIBADD += -lgeom
213213
endif
214214

215-
libzpool_la_LDFLAGS += -version-info 6:0:0
215+
libzpool_la_LDFLAGS += -version-info 7:0:0
216216

217217
if TARGET_CPU_POWERPC
218218
module/zfs/libzpool_la-vdev_raidz_math_powerpc_altivec.$(OBJEXT) : CFLAGS += -maltivec

0 commit comments

Comments
 (0)