Closed danielkza closed 10 years ago
--- a/debian/rules +++ b/debian/rules @@ -147,6 +147,7 @@ override_dh_makeshlibs: ifeq ($(BUILD_UDEB), true) dh_makeshlibs -plibnvpair$(SHLIB_MAJOR) --add-udeb=libnvpair$(SHLIB_MAJOR)-udeb dh_makeshlibs -plibuutil$(SHLIB_MAJOR) --add-udeb=libuutil$(SHLIB_MAJOR)-udeb
- dh_makeshlibs -plibzfs_core$(SHLIB_MAJOR) --add-udeb=libzfs_core$(SHLIB_MAJOR)-udeb dh_makeshlibs -plibzfs$(SHLIB_MAJOR) --add-udeb=libzfs$(SHLIB_MAJOR)-udeb dh_makeshlibs -plibzpool$(SHLIB_MAJOR) --add-udeb=libzpool$(SHLIB_MAJOR)-udeb dh_makeshlibs -pzfsutils --add-udeb=zfsutils-udeb Why did you create a separate package for libzfs_core instead of putting it in libzfsX? --- a/debian/control.in +++ b/debian/control.in @@ -48,16 +48,16 @@ Description: Solaris userland utility library for Linux Package: libzfs-dev Section: libdevel Architecture: linux-any -Depends: libzfs1 (= ${binary:Version}), ${misc:Depends} +Depends: libzfs2 (= ${binary:Version}), ${misc:Depends} Provides: libnvpair-dev, libuutil-dev Description: Native ZFS filesystem development files for Linux Header files and static libraries for compiling software against Ok, that makes sense... Oups! lib/libzfs_core/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) That should probably have been a quilt patch instead.
Why did you create a separate package for libzfs_core instead of putting it in libzfsX?
It isn't actually generating a separate package, just listing the lib versions for processing. That's my understand of shlibs anyway, but I might be mistaken. At least in my build libzfs_core did end up in libzfs2 deb.
That should probably have been a quilt patch instead.
You're right, that slipped through. But can you explain me why libzfs and the other libraries don't have an explicit dependency on libspl? Without the added dep libzfs_core built with a warning for missing strlcpy which is in libspl.
Latest daily/snapshot for Debian GNU/Linux Wheezy is now snapshot/debian/wheezy/0.6.3-0.9_g540ce4_wheezy
.
I'm looking at your current version of the initramfs script and it doesn't seem right: if only the root= parameter is set and nothing else, rpool= will be defaulted to 'rpool', and when the code which should extract rpool= from root= runs, rpool= won't be empty, and it will be skipped.
I also don't understand why you are using a specific search for 'zfs:' on multiple cases, when you should simply extract the prefix, whether it is 'ZFS=' or 'zfs:', and simply use the extracted part going forwards.
Completely different issue. Feel free to open a separate issue about this.
Right, my bad.
Here are my tentative patches to move up the debian repo to the latest ZoL upstream. I only included my changes as patches because the whole merge was pretty gigantic, and including it here would be redundant since it can be easily produced from the upstream repo.