Disable library udeb by default

We still need to see whether we are able to get zfs binary udebs
land in the archive, so don't build it for the moment.

Pass BUILD_UDEB=true to enable it.

diff --git a/debian/control b/debian/control
index c41e99b60a8f6eb8b357241077be3e6556a2da36..43a6258ea7639afe1f4e4d34eed97a7a655623e4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -45,17 +45,6 @@ Description: Debugging symbols for libnvpair1
  .
  This package contains the debugging symbols for libnvpair1.
 
-Package: libnvpair1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library (debian-installer version)
- This package contains the OpenSolaris libnvpair library, for managing
- name-value pairs.
- .
- This is a minimal package for use in debian-installer.
-
 Package: libuutil1
 Section: libs
 Architecture: linux-any
@@ -93,16 +82,6 @@ Description: Debugging symbols for libuutil1
  .
  This package contains the debugging symbols for libuutil1.
 
-Package: libuutil1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris userland utility library (debian-installer version)
- This package contains the OpenSolaris userland utility library.
- .
- This is a minimal package for use in debian-installer.
-
 Package: libzfs-dev
 Section: libdevel
 Architecture: linux-any
@@ -142,19 +121,6 @@ Description: Debugging symbols for libzfs1
  .
  This package contains the debugging symbols for libzfs1.
 
-Package: libzfs1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris ZFS library (debian-installer version)
- The Z file system is a pooled filesystem designed for maximum data integrity,
- supporting data snapshots, multiple copies, and data checksums.
- .
- The ZFS library provides support for managing ZFS filesystems.
- .
- This is a minimal package for use in debian-installer.
-
 Package: libzpool1
 Section: libs
 Architecture: linux-any
@@ -182,16 +148,6 @@ Description: Debugging symbols for libzpool1
  .
  This package contains the debugging symbols for libzpool1.
 
-Package: libzpool1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris interface library to manage ZFS storage pools (debian-installer version)
- This package contains the OpenSolaris libzpool library.
- .
- This is a minimal package for use in debian-installer.
-
 Package: zfs-dkms
 Architecture: all
 Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
@@ -250,20 +206,3 @@ Description: Debugging symbols for zfsutils
  integrity, supporting data snapshots, multiple copies, and data checksums.
  .
  This package contains the debugging symbols for zfsutils.
-
-Package: zfsutils-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),
- libzfs1-udeb (= ${binary:Version}), libzpool1-udeb (= ${binary:Version}),
- zfs-modules,
-Description: command-line tools to manage ZFS filesystems (debian-installer version)
- The Z file system is a pooled filesystem designed for maximum data integrity,
- supporting data snapshots, multiple copies, and data checksums.
- .
- This package provides the zfs and zpool commands to create and administer
- ZFS filesystems.
- .
- This is a minimal package for use in debian-installer.

diff --git a/debian/control.in b/debian/control.in
index f23f71ceb6960ac0131290d80db4be871543025b..43a6258ea7639afe1f4e4d34eed97a7a655623e4 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,17 +45,6 @@ Description: Debugging symbols for libnvpair1
  .
  This package contains the debugging symbols for libnvpair1.
 
-Package: libnvpair1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library (debian-installer version)
- This package contains the OpenSolaris libnvpair library, for managing
- name-value pairs.
- .
- This is a minimal package for use in debian-installer.
-
 Package: libuutil1
 Section: libs
 Architecture: linux-any
@@ -93,16 +82,6 @@ Description: Debugging symbols for libuutil1
  .
  This package contains the debugging symbols for libuutil1.
 
-Package: libuutil1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris userland utility library (debian-installer version)
- This package contains the OpenSolaris userland utility library.
- .
- This is a minimal package for use in debian-installer.
-
 Package: libzfs-dev
 Section: libdevel
 Architecture: linux-any
@@ -142,19 +121,6 @@ Description: Debugging symbols for libzfs1
  .
  This package contains the debugging symbols for libzfs1.
 
-Package: libzfs1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris ZFS library (debian-installer version)
- The Z file system is a pooled filesystem designed for maximum data integrity,
- supporting data snapshots, multiple copies, and data checksums.
- .
- The ZFS library provides support for managing ZFS filesystems.
- .
- This is a minimal package for use in debian-installer.
-
 Package: libzpool1
 Section: libs
 Architecture: linux-any
@@ -182,16 +148,6 @@ Description: Debugging symbols for libzpool1
  .
  This package contains the debugging symbols for libzpool1.
 
-Package: libzpool1-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris interface library to manage ZFS storage pools (debian-installer version)
- This package contains the OpenSolaris libzpool library.
- .
- This is a minimal package for use in debian-installer.
-
 Package: zfs-dkms
 Architecture: all
 Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
@@ -227,7 +183,7 @@ Package: zfsutils
 Section: admin
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: zfs-dkms
+Recommends: zfs-modules | zfs-dkms
 Suggests: samba-common-bin (>= 3.0.23), nfs-kernel-server, zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
@@ -250,20 +206,3 @@ Description: Debugging symbols for zfsutils
  integrity, supporting data snapshots, multiple copies, and data checksums.
  .
  This package contains the debugging symbols for zfsutils.
-
-Package: zfsutils-udeb
-Package-Type: udeb
-Section: debian-installer
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),
- libzfs1-udeb (= ${binary:Version}), libzpool1-udeb (= ${binary:Version}),
- zfs-modules,
-Description: command-line tools to manage ZFS filesystems (debian-installer version)
- The Z file system is a pooled filesystem designed for maximum data integrity,
- supporting data snapshots, multiple copies, and data checksums.
- .
- This package provides the zfs and zpool commands to create and administer
- ZFS filesystems.
- .
- This is a minimal package for use in debian-installer.

diff --git a/debian/control.udeb.in b/debian/control.udeb.in
new file mode 100644 (file)
index 0000000..83ce19d
--- /dev/null
+++ b/debian/control.udeb.in
@@ -0,0 +1,74 @@
+
+Package: libnvpair1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Solaris name-value library for Linux (debian-installer)
+ This library provides routines for packing and unpacking nv pairs for
+ transporting data across process boundaries, transporting between
+ kernel and userland, and possibly saving onto disk files.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libuutil1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Solaris userland utility library for Linux (debian-installer)
+ 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.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libzfs1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: OpenSolaris ZFS library (debian-installer)
+ The Z file system is a pooled filesystem designed for maximum data integrity,
+ supporting data snapshots, multiple copies, and data checksums.
+ .
+ The ZFS library provides support for managing ZFS filesystems.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: libzpool1-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Native ZFS pool library for Linux (debian-installer)
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data
+ checksums.
+ .
+ This zpool library provides support for managing zpools.
+ .
+ This is a minimal package for use in debian-installer.
+
+Package: zfsutils-udeb
+Package-Type: udeb
+Section: debian-installer
+Architecture: linux-any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),
+ libzfs1-udeb (= ${binary:Version}), libzpool1-udeb (= ${binary:Version}),
+ zfs-modules,
+Description: command-line tools to manage ZFS filesystems (debian-installer)
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data checksums.
+ .
+ This package provides the zfs and zpool commands to create and administer
+ ZFS filesystems.
+ .
+ This is a minimal package for use in debian-installer.

diff --git a/debian/rules b/debian/rules
index 853b312f53b78a63708ec3078b635ea825323937..e08d14599f8a78aea0e8af5181d89a8a3c261b9c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,10 @@ DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 
 export SHLIB_MAJOR = 1
 
+ifndef BUILD_UDEB
+BUILD_UDEB=false
+endif
+
 ifndef DEB_HOST_ARCH
 DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 endif
@@ -27,6 +31,9 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 
 override_dh_auto_configure:
        @cp debian/control.in debian/control
+ifeq ($(BUILD_UDEB), true)
+       cat debian/control.udeb.in >> debian/control
+endif
 
        @# Embed the downstream version in the module.
        @sed -e 's/^Version:.*/Version:      $(VERSION)/' -i.orig META
@@ -106,8 +113,8 @@ else ifeq ($(LSB_DISTRIBUTOR),Ubuntu)
        dh_installinit --name=zfs-share \
          --no-restart-on-upgrade --no-start -- defaults 21 79
 else
-               dh_installinit --name=zfs-share \
-                 --no-restart-on-upgrade --no-start
+       dh_installinit --name=zfs-share \
+         --no-restart-on-upgrade --no-start
 endif
 
 override_dh_dkms:
@@ -115,11 +122,13 @@ override_dh_dkms:
 
 override_dh_makeshlibs:
        dh_makeshlibs -a
+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$(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
+   endif
 
 override_dh_shlibdeps:
        @# Suppress libtool dependency_libs warnings that are caused by
@@ -133,17 +142,21 @@ override_dh_strip:
        dh_strip -plibzfs1 --dbg-package=libzfs1-dbg
        dh_strip -plibzpool1 --dbg-package=libzpool1-dbg
        dh_strip -pzfsutils --dbg-package=zfsutils-dbg
-
+ifeq ($(BUILD_UDEB), true)
        dh_strip -plibnvpair$(SHLIB_MAJOR)-udeb
        dh_strip -plibuutil$(SHLIB_MAJOR)-udeb
        dh_strip -plibzfs$(SHLIB_MAJOR)-udeb
        dh_strip -plibzpool$(SHLIB_MAJOR)-udeb
        dh_strip -pzfsutils-udeb
+endif
 
 override_dh_auto_clean:
        dh_auto_clean
        @if test -e META.orig; then mv META.orig META; fi
        cp debian/control.in debian/control
+ifeq ($(BUILD_UDEB), true)
+       cat debian/control.udeb.in >> debian/control
+endif
 
 override_dh_install:
        find . -name lib*.la -delete