UBUNTU: [Config] supply zfs dkms Provides: based on do_zfs

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index 8f734b8b0513d83208b9f8f438088a6e53168f07..a84fe29960bbfd4639e551d934ba8f1f704c2438 100644 (file)
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -27,7 +27,7 @@ Architecture: ARCH
 Section: kernel
 Priority: optional
 Pre-Depends: dpkg (>= 1.10.24)
-Provides: linux-image, linux-image-3.0, fuse-module, =PROVIDES=
+Provides: linux-image, linux-image-3.0, fuse-module, =PROVIDES==RPROVIDES=
 Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6) | linux-initramfs-tool, kmod
 Conflicts: hotplug (<< 0.0.20040105-1)
 Recommends: BOOTLOADER

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index ee129f66d5314d464abaff206e131f7b130fe3d3..d35ccb40fafe88239d3a9327391ee5df152254df 100644 (file)
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -3,4 +3,4 @@ supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
 bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo (>= 19.1) [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, spl-dkms, zfs-dkms, virtualbox-guest-modules [i386 amd64 x32]"
+provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [i386 amd64 x32]"

diff --git a/debian.master/control.d/vars.powerpc64-smp b/debian.master/control.d/vars.powerpc64-smp
index c74e062db4c45ff7f667a7fe1ddbfec184c5fe55..667e2198fdaa572f3c961a2eaca986311a461ea7 100644 (file)
--- a/debian.master/control.d/vars.powerpc64-smp
+++ b/debian.master/control.d/vars.powerpc64-smp
@@ -2,6 +2,6 @@ supported="64-bit PowerPC SMP"
 target="Geared toward desktop or server systems."
 desc="64-bit PowerPC SMP"
 bootloader="yaboot"
-provides="redhat-cluster-modules, ivtv-modules, spl-dkms, zfs-dkms"
+provides="redhat-cluster-modules, ivtv-modules"
 arch="powerpc"
 do_zfs=true