From patchwork Tue Dec 3 22:26:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1203881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47SGp56LmTz9sP3; Wed, 4 Dec 2019 09:27:57 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1icGe9-0004sJ-17; Tue, 03 Dec 2019 22:27:53 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1icGdv-0004ew-1h for kernel-team@lists.ubuntu.com; Tue, 03 Dec 2019 22:27:39 +0000 Received: from mail-yw1-f69.google.com ([209.85.161.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1icGds-0001MA-Jf for kernel-team@lists.ubuntu.com; Tue, 03 Dec 2019 22:27:36 +0000 Received: by mail-yw1-f69.google.com with SMTP id x206so3578463ywa.22 for ; Tue, 03 Dec 2019 14:27:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t91+TUE5LYiHKMRtuh84i2xMDVeX+C+DVVzul54fbsk=; b=uI+DJeKiiiqrAkj5BUCQ3vkUsZbSrCe3gXwzUXczEkF7t+vs9FehfVVaJoWrcxHt6x sSp9HPBUwM1IUP7LhH2Gh3GP3huEeKZybWhPoluveeWhZCR27lghu9OhdQspQDpHdxfc ebeMsLiG5Yg+9Lo5+jrKOhLA08ZXJiS7Gx6wCaoyFLQV77e/16L7wlLNH29t14pPZ1Rn GvY8IoObWaVYxL/ZlEga6l14BgDIXqlx2S86xEIjDUA7eNiVxxJsar6QZPbdOVB6IFg6 16VbuHRZqO8pJ4WFAE0BzQyiDJPPSK7KEDfh8gHgkjg5rCpMdonqf8DeFm6YNIDOz0dm M/aQ== X-Gm-Message-State: APjAAAVyBWdFC+2GXqJ5uDu6nFeAQNCJKgO16RNcM5HkHDLeTApgVWAb SGWYxNv2TO9ZVjMEWhC0Ad+tYAvwMFrPJRuhIkrJbw8ggGGOuTKKBfnYIWZ7JriFV2lktU2irym t2mvqG8f5FsGeUjjg5Lo4EG+ZmvX2AuYw8clqqp7W8A== X-Received: by 2002:a81:698b:: with SMTP id e133mr5608731ywc.65.1575412055381; Tue, 03 Dec 2019 14:27:35 -0800 (PST) X-Google-Smtp-Source: APXvYqzTZonizUejLICScooNIEsChZwckJOxK2bc+fWhLJ5P74un96eNnOeIr2BWirW9L5jz856kdw== X-Received: by 2002:a81:698b:: with SMTP id e133mr5608720ywc.65.1575412055099; Tue, 03 Dec 2019 14:27:35 -0800 (PST) Received: from localhost ([136.37.150.243]) by smtp.gmail.com with ESMTPSA id r64sm2212146ywg.84.2019.12.03.14.27.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 14:27:34 -0800 (PST) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [REVIEW 5/6][linux-restricted-modules] UBUNTU: [Debian] Only produce transitionals for primary variant Date: Tue, 3 Dec 2019 16:26:56 -0600 Message-Id: <20191203222657.1152249-23-seth.forshee@canonical.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203222657.1152249-1-seth.forshee@canonical.com> References: <20191203222657.1152249-1-seth.forshee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- debian/rules | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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)) endif 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) +endif +control_files += $(filter-out $(primary_control_files),$(shell LC_ALL=C ls -d debian/control.d/*)) test: echo "$(src_fullversion) $(src_version)"