From patchwork Fri Nov 20 13:39:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1403731 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 4CcyMW4rt9z9sT6; Sat, 21 Nov 2020 00:39:35 +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 1kg6dP-00048l-Q7; Fri, 20 Nov 2020 13:39:31 +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 1kg6dL-000463-QZ for kernel-team@lists.ubuntu.com; Fri, 20 Nov 2020 13:39:27 +0000 Received: from mail-ed1-f71.google.com ([209.85.208.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kg6dL-0008VW-DM for kernel-team@lists.ubuntu.com; Fri, 20 Nov 2020 13:39:27 +0000 Received: by mail-ed1-f71.google.com with SMTP id b68so3752065edf.9 for ; Fri, 20 Nov 2020 05:39:27 -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=hlH7QJs4kf6vs63Y0qE6u1+1Vq3GC29SHarWCsAAhRmyESxel/qbxJw6UFWEeGoqMU 66soHPN9XdAoKs2ZO9FIZ1KJjXxSRjInc9EROLLMY1D+5BavaJVN5R9F/HP4yjRVusne 62eEFCbpl2LDfwMnTZM9fbU6AY874hyXr7KPYUuZUUEz5eBpNKYh+ZOzFZalNGlZlRSh AwZ9txtHcZEquIkYjQiW95R76I7O52v2g+KKzutFcpjt7Tj9FwJoVDFIRY++q5nZBwiG FXSUqhNA4AbV9WEpAGqul4n3/tEbR5HV4c7qY1EzSfDZX3BaBWoplm0akVJQbVbIywyq SYJQ== X-Gm-Message-State: AOAM5314cDIedyj1n8/dkwpxy4ErAdgMiFgD5y+x981BIuCQYlx3iNc/ cIZ47+rfSl+MR8kOu1T0GmKpzTig56K6n/vX3iH+H3ZR1PvJq1uqLWO/CIFRS11UAilkBN8+Fir /UPestVl/ge+r9OIvOvI2wnwSVcsmfNSx3JQeUgW3UQ== X-Received: by 2002:aa7:da01:: with SMTP id r1mr36418537eds.45.1605879566786; Fri, 20 Nov 2020 05:39:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJwUnlKCbAPYYHHehK1tXgQQmbxQuZ0FDfbuF3cRrP+rOoBTg0503iMiCH/97jVi6oj4lEWilA== X-Received: by 2002:aa7:da01:: with SMTP id r1mr36418522eds.45.1605879566509; Fri, 20 Nov 2020 05:39:26 -0800 (PST) Received: from localhost ([2001:470:6973:2:d95:497b:a9f7:942d]) by smtp.gmail.com with ESMTPSA id y15sm1109896eds.56.2020.11.20.05.39.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2020 05:39:26 -0800 (PST) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [focal/linux-meta-oem-5.10 1/1] UBUNTU: [Packaging] express oem flavour explicitly Date: Fri, 20 Nov 2020 13:39:17 +0000 Message-Id: <20201120133918.282869-5-apw@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201120133918.282869-1-apw@canonical.com> References: <20201120133918.282869-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