libzfs devel packages

6 files changed, 79 insertions, 1 deletions

diff --git a/zfsutils/debian/control b/zfsutils/debian/control
index 21f074d..447a86f 100644
--- a/zfsutils/debian/control
+++ b/zfsutils/debian/control
@@ -25,9 +25,37 @@ Build-Depends:
  libfdisk1-dev [illumos-amd64 illumos-i386],
  lib32fdisk1-dev [illumos-amd64], 
  quilt,
+ symlinks,
 Standards-Version: 3.9.3
 Homepage: https://www.illumos.org
 
+Package: libzfs-core1-dev
+Section: libdevel
+Priority: optional
+Architecture: illumos-any
+Provides: libzfs-core-dev
+Depends: libzfs-core1 (= ${binary:Version}), ${misc:Depends}, libnvpair1-dev,
+Description: new generation ZFS library (development files)
+ This package contains the header files and symlinks needed
+ to compile applications that use libzfs-core.
+ .
+ The libzfs_core library is a thin wrapper around the kernel ioctls.
+ It addresses some design issues of original outgrown libzfs.
+
+Package: lib32zfs-core1-dev
+Section: libdevel
+Priority: optional
+Architecture: illumos-any
+Provides: lib32zfs-core-dev
+Depends: lib32zfs-core1 (= ${binary:Version}), libzfs-core1-dev (= ${binary:Version}),
+ ${misc:Depends}
+Description: new generation ZFS library (32-bit development files)
+ This package contains the header files and symlinks needed
+ to compile 32-bit applications that use libzfs-core.
+ .
+ The libzfs_core library is a thin wrapper around the kernel ioctls.
+ It addresses some design issues of original outgrown libzfs.
+
 Package: libzfs-core1
 Section: libs
 Priority: standard
@@ -217,3 +245,30 @@ Description: disk management library (32-bit development files)
  This package contains files needed to compile
  32-bit applications that use libdiskmgt.
  
+
+Package: libzfs1-dev
+Section: libdevel
+Priority: optional
+Architecture: illumos-any
+Provides: libzfs-dev
+Depends: libzfs1 (= ${binary:Version}), ${misc:Depends}, libnvpair1-dev,
+Description: ZFS library (development files)
+ This package contains the header files and symlinks needed
+ to compile applications that use libzfs.
+ .
+ The Z file system is a pooled filesystem designed for maximum data integrity,
+ supporting data snapshots, multiple copies, and data checksums.
+
+Package: lib32zfs1-dev
+Section: libdevel
+Priority: optional
+Architecture: illumos-any
+Provides: lib32zfs-dev
+Depends: lib32zfs1 (= ${binary:Version}), libzfs1-dev (= ${binary:Version}),
+ ${misc:Depends}
+Description: ZFS library (32-bit development files)
+ This package contains the header files and symlinks needed
+ to compile 32-bit applications that use libzfs.
+ .
+ The Z file system is a pooled filesystem designed for maximum data integrity,
+ supporting data snapshots, multiple copies, and data checksums.
diff --git a/zfsutils/debian/lib32zfs-core1-dev.install b/zfsutils/debian/lib32zfs-core1-dev.install
new file mode 100644
index 0000000..e934283
--- /dev/null
+++ b/zfsutils/debian/lib32zfs-core1-dev.install
@@ -0,0 +1 @@
+usr/lib32/libzfs_core.so
diff --git a/zfsutils/debian/lib32zfs1-dev.install b/zfsutils/debian/lib32zfs1-dev.install
new file mode 100644
index 0000000..43810ce
--- /dev/null
+++ b/zfsutils/debian/lib32zfs1-dev.install
@@ -0,0 +1 @@
+usr/lib32/libzfs.so
diff --git a/zfsutils/debian/libzfs-core1-dev.install b/zfsutils/debian/libzfs-core1-dev.install
new file mode 100644
index 0000000..8ac671a
--- /dev/null
+++ b/zfsutils/debian/libzfs-core1-dev.install
@@ -0,0 +1,2 @@
+usr/include/libzfs_core.h
+usr/lib/*/libzfs_core.so
diff --git a/zfsutils/debian/libzfs1-dev.install b/zfsutils/debian/libzfs1-dev.install
new file mode 100644
index 0000000..6ad0c43
--- /dev/null
+++ b/zfsutils/debian/libzfs1-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libzfs.so
+usr/include/libzfs.h
diff --git a/zfsutils/debian/rules b/zfsutils/debian/rules
index 4197ca9..398ec5d 100755
--- a/zfsutils/debian/rules
+++ b/zfsutils/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/architecture.mk
 export DH_VERBOSE = 1
 
 # libdiskmgt needs libzfs for data structures and dlopen()
@@ -91,7 +92,23 @@ lib-stamp: dirs-stamp mapfiles-stamp headers-stamp patch-stamp
 	dh_illumos_make $(libs:%=usr/src/lib/%)
 	touch $@
 
-install build build-arch build-indep: build-stamp
+install: install-stamp
+install-stamp: build-stamp
+	# Move dev symlink from /lib into /usr/lib:
+	for l in `find debian/tmp/lib32 -maxdepth 1 -type l -name \*.so`; do \
+		ln -sf `readlink -f $$l` debian/tmp/usr/lib32/`basename $$l`; \
+		rm $$l; \
+	done
+	for l in `find debian/tmp/lib/$(DEB_HOST_MULTIARCH) -maxdepth 1 -type l -name \*.so`; do \
+		ln -sf `readlink -f $$l` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$l`; \
+		rm $$l; \
+	done
+	# Make symlinks relative:
+	symlinks -c debian/tmp/usr/lib32
+	symlinks -c debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	touch $@
+
+build build-arch build-indep: build-stamp
 build-stamp: lib-stamp cmd-stamp
 	touch $@