[R][PATCH 2/2] UBUNTU: [Packaging] Don't hard-code lmm zfs dependency

[Juerg Haefliger]

Move the dependency on lmm zfs to control.d/vars.<flavour> and patch it
in when the control file is generated.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian.master/control.d/flavour-control.stub | 3 ++-
 debian.master/control.d/vars.generic         | 1 +
 debian.master/control.d/vars.generic-64k     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub
index fd14eb07e459..9fc2050223a6 100644
--- a/debian.master/control.d/flavour-control.stub
+++ b/debian.master/control.d/flavour-control.stub
@@ -5,6 +5,7 @@
 # TARGET
 # BOOTLOADER
 # =PROVIDES=
+# =DEPENDS=
 #
 # Items marked with =FOO= are optional
 #
@@ -25,7 +26,7 @@ Build-Profiles: <!stage1>
 Architecture: ARCH
 Section: kernel
 Priority: optional
-Depends: ${misc:Depends}, ${shlibs:Depends}, linux-main-modules-zfs-PKGVER-ABINUM-FLAVOUR [amd64 arm64 ppc64el s390x], wireless-regdb
+Depends: ${misc:Depends}, ${shlibs:Depends}, =DEPENDS=wireless-regdb
 Built-Using: ${linux:BuiltUsing}
 Description: Linux kernel modules for version PKGVER
  Contains the corresponding System.map file, the modules built by the
diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index 3fd9beb0a776..c5a897daf8d0 100644
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -3,3 +3,4 @@ supported="Generic"
 target="Geared toward desktop and server systems."
 bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]"
 provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
+depends="linux-main-modules-zfs-PKGVER-ABINUM-generic [amd64 arm64 ppc64el s390x]"
diff --git a/debian.master/control.d/vars.generic-64k b/debian.master/control.d/vars.generic-64k
index cd772b42f9d7..732326c0ad17 100644
--- a/debian.master/control.d/vars.generic-64k
+++ b/debian.master/control.d/vars.generic-64k
@@ -3,3 +3,4 @@ supported="Generic 64K pages"
 target="Geared toward desktop and server systems."
 bootloader="grub-efi-arm64 [arm64] | flash-kernel [arm64]"
 provides="kvm-api-4, redhat-cluster-modules, ivtv-modules"
+depends="linux-main-modules-zfs-PKGVER-ABINUM-generic-64k [arm64]"
-- 
2.51.0