From patchwork Fri Nov 20 13:01:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1403687 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 4CcxXH1s6bz9sTv; Sat, 21 Nov 2020 00:02:07 +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 1kg639-00010X-DK; Fri, 20 Nov 2020 13:02:03 +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 1kg635-0000xi-Al for kernel-team@lists.ubuntu.com; Fri, 20 Nov 2020 13:01:59 +0000 Received: from mail-ej1-f70.google.com ([209.85.218.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kg635-0005dr-1y for kernel-team@lists.ubuntu.com; Fri, 20 Nov 2020 13:01:59 +0000 Received: by mail-ej1-f70.google.com with SMTP id r2so505263ejx.9 for ; Fri, 20 Nov 2020 05:01:59 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BQ91PcgW1Tf0bhcu/cDnU0OSUnSqLUShFdOM+y4L6WQ=; b=CYQ0GP9RI5McQF08qBR9FgorMuKwl5rhY+7tONCK7IiJGfPjqaxRHh932yk2A8kMKb kFI21RjxMQZ1Mh2EiYIt4W3XrlEuSBfmg6nD+HFxWKMKpBtx+H2G3If8I7KKmTpK/GGU W+A88kQ7x/0CX020jopzCJ60Ahxs6FjiN8yu1gy5iPhVxvh7wIsCZ5HBI5Y2P9+1rEQ2 IbA+OBnsQos1M/+r/krCRiRTWB0Povc5YYDxBMHFiKghwQufJyCoiRmc1SdRCydHbc+p oMoT5OkVR5pf3mmLSEIzexVc6p+9DpLI/S2CSEahVTRAihPMPWssl8H9NkyUGtWOLR6e 9ENA== X-Gm-Message-State: AOAM532MAHBxck5fHTP3/0gn1XpSur6DAJYVc+cMycAsnLvfjr2FfqKj L75qtS4ximDeil5TCa9cVXjXkcLCTu7vf3icMwMd3l8XRCWfqysRNHntFNy0lReDmMrlPpwx/AD tlbPTDaXjySagD8r6VS0Nrs+5u+O5GOVy4p9nhCIRkA== X-Received: by 2002:a17:906:8485:: with SMTP id m5mr34135446ejx.205.1605877318356; Fri, 20 Nov 2020 05:01:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxT9Yu/Gf3rxIeEeGSDc5HIhyTdDE8NITtv44J4RSBLO9SNo4xa9N9XNt1Sdr4A0hjdx8ay4g== X-Received: by 2002:a17:906:8485:: with SMTP id m5mr34135386ejx.205.1605877317779; Fri, 20 Nov 2020 05:01:57 -0800 (PST) Received: from localhost ([2001:470:6973:2:d95:497b:a9f7:942d]) by smtp.gmail.com with ESMTPSA id lu33sm1094495ejb.98.2020.11.20.05.01.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 05:01:57 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [focal/oem-5.6/oem-5.10 1/1] UBUNTU: [Packaging] express oem flavour explicitly Date: Fri, 20 Nov 2020 13:01:48 +0000 Message-Id: <20201120130149.259300-5-apw@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201120130149.259300-1-apw@canonical.com> References: <20201120130149.259300-1-apw@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: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1905013 Signed-off-by: Andy Whitcroft --- debian/control.d/oem | 10 +++++----- debian/variants | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/control.d/oem b/debian/control.d/oem index 467e049..1c4e2de 100644 --- a/debian/control.d/oem +++ b/debian/control.d/oem @@ -1,4 +1,4 @@ -Package: linux-headers${variant:suffix} +Package: linux-headers-oem${variant:suffix} Architecture: amd64 Section: kernel Provides: ${variant:provides-headers} @@ -7,7 +7,7 @@ Description: OEM Linux kernel headers This package will always depend on the latest OEM kernel headers available. -Package: linux-image${variant:suffix} +Package: linux-image-oem${variant:suffix} Architecture: amd64 Section: kernel Provides: ${variant:provides-image} ${dkms:zfs-modules} ${dkms:wireguard-linux-compat-modules} @@ -17,7 +17,7 @@ Description: OEM Linux kernel image This package will always depend on the latest OEM kernel image available. -Package: linux-tools${variant:suffix} +Package: linux-tools-oem${variant:suffix} Architecture: amd64 Section: kernel Provides: linux-tools @@ -26,11 +26,11 @@ Description: OEM Linux kernel tools This package will always depend on the latest OEM kernel tools available. -Package: linux${variant:suffix} +Package: linux-oem${variant:suffix} Architecture: amd64 Section: kernel Provides: ${test:provides-full-oem} ${test:provides-full-preferred} ${variant:provides} -Depends: ${misc:Depends}, linux-image${variant:suffix} (= ${binary:Version}), linux-headers${variant:suffix} (= ${binary:Version}) +Depends: ${misc:Depends}, linux-image-oem${variant:suffix} (= ${binary:Version}), linux-headers-oem${variant:suffix} (= ${binary:Version}) Description: Complete OEM Linux kernel and headers This package will always depend on the latest complete OEM Linux kernel and headers. diff --git a/debian/variants b/debian/variants index 7edabe1..a5f9f8e 100644 --- a/debian/variants +++ b/debian/variants @@ -1 +1 @@ --oem-20.04-edge +-20.04-edge