[REVIEW,5/6,linux-restricted-modules] UBUNTU: [Debian] Only produce transitionals for primary variant
diff mbox series

Message ID 20191203222657.1152249-23-seth.forshee@canonical.com
State New
Headers show
  • Untitled series #146344
Related show

Commit Message

Seth Forshee Dec. 3, 2019, 10:26 p.m. UTC
We only want the primary variant to produce transitional meta
packages, so only include them in debian/control if
debian/variants includes the primary variant.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
 debian/rules | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff mbox series

diff --git a/debian/rules b/debian/rules
index 913148e835fd..b16106d7d77f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,12 @@  ifneq (,$(wildcard debian/variants))
 control_files := debian/control.common
-control_files += $(shell LC_ALL=C ls -d debian/control.d/*)
+# control files only wanted for the primary variant
+primary_control_files := $(shell LC_ALL=C ls -d debian/control.d/transitionals-*)
+ifneq ($(filter --, $(variants)),)
+	control_files += $(primary_control_files)
+control_files += $(filter-out $(primary_control_files),$(shell LC_ALL=C ls -d debian/control.d/*))
 	echo "$(src_fullversion) $(src_version)"