From patchwork Tue Dec 3 22:26:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1203861 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 47SGnN2sPWz9sPh; Wed, 4 Dec 2019 09:27:20 +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 1icGdQ-0004Hk-Q5; Tue, 03 Dec 2019 22:27:08 +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 1icGdP-0004Gr-KK for kernel-team@lists.ubuntu.com; Tue, 03 Dec 2019 22:27:07 +0000 Received: from mail-yw1-f72.google.com ([209.85.161.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1icGdP-0001Jk-8l for kernel-team@lists.ubuntu.com; Tue, 03 Dec 2019 22:27:07 +0000 Received: by mail-yw1-f72.google.com with SMTP id b70so3619094ywa.15 for ; Tue, 03 Dec 2019 14:27:07 -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=ltPLsXDYXnmvCJjTB5f8XheAlHSlQPQr8jo8gn/VYfQ=; b=JrJX1/gU6EJ/pGuquoB1IWCK2L+EZlM9CRnpLc3dURCTnqpJRwMJRrYIxWMeNIOWXX V57G/PV72Q/fbANfGXPQAXH4Fcg+YbnveRXIHbn4zQcT/Q2Ur7o0ZukDmLipj2hg+vjQ 8GQKE+msu87nOrHl/anajNncNG6otz3AtQoLl/CXJxS2yDq26phL+QieVewGVc7Cfk7x CsthD1IAx0f2IvLaqyO3BmitvveTGY4jjvMNiW3yGKbHTvgLrlc0lhPqarcYiwuU/J97 X85vxSxUpnhOVD3ZKBxlc/zvyNVu0pU6GGyi9p63vdcq8t6OPf6j1atta+w5UWr55Wkj MQ1g== X-Gm-Message-State: APjAAAWUf9xX/Ji2kAC6yZw6N0Po+h8DH++zVLEZOF8PiUBR8p30dVyC IVn9QXr/U7kXOjas7ARCt/hrAyAuThp3QTk0yImKCIzl5yjP7kMQrOr5I16g310Rq3NklFC86K+ i4rrOvNfIoWeUbtggiQLu4QwWNMg8LSmuiZ0snX0lMg== X-Received: by 2002:a81:7606:: with SMTP id r6mr6024072ywc.418.1575412026082; Tue, 03 Dec 2019 14:27:06 -0800 (PST) X-Google-Smtp-Source: APXvYqx1k4FTWnbBJVWGrUo6mVs9+WsGKK856lkknMlOiwpgG0FZ6ssb85ZmVL5FAuX2Coqoc4ddRA== X-Received: by 2002:a81:7606:: with SMTP id r6mr6024063ywc.418.1575412025758; Tue, 03 Dec 2019 14:27:05 -0800 (PST) Received: from localhost ([136.37.150.243]) by smtp.gmail.com with ESMTPSA id v19sm2166653ywh.60.2019.12.03.14.27.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 14:27:05 -0800 (PST) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [REVIEW 04/10][linux] UBUNTU: [Debian] Read variants list into a variable Date: Tue, 3 Dec 2019 16:26:38 -0600 Message-Id: <20191203222657.1152249-5-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" Read the contents of $DEBIAN/variants into a variable, for use in later patches. For backwards compatability, assume the primary variant "--" if the variants file is not present. Signed-off-by: Seth Forshee --- debian/rules.d/0-common-vars.mk | 6 ++++++ debian/rules.d/1-maintainer.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk index bcab5749f8aa..a5035def11d6 100644 --- a/debian/rules.d/0-common-vars.mk +++ b/debian/rules.d/0-common-vars.mk @@ -18,6 +18,12 @@ prev_revision := $(word $(words $(prev_revisions)),$(prev_revisions)) prev_fullver ?= $(shell dpkg-parsechangelog -l$(DEBIAN)/changelog -o1 -c1 | sed -ne 's/^Version: *//p') +# Get variants. Assume primary if debian/variants is not present. +variants = -- +ifneq (,$(wildcard $(DEBIAN)/variants)) + variants := $(shell cat $(DEBIAN)/variants) +endif + # Get upstream version info upstream_version := $(shell sed -n 's/^VERSION = \(.*\)$$/\1/p' Makefile) upstream_patchlevel := $(shell sed -n 's/^PATCHLEVEL = \(.*\)$$/\1/p' Makefile) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 6b4e0901c288..2c07c075f349 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -62,6 +62,7 @@ printenv: @echo "abinum = $(abinum)" @echo "upstream_tag = $(upstream_tag)" @echo "gitver = $(gitver)" + @echo "variants = $(variants)" @echo "flavours = $(flavours)" @echo "skipabi = $(skipabi)" @echo "skipmodule = $(skipmodule)"