From patchwork Thu Feb 7 13:24:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 1038065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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 43wJv938SVz9s4V; Fri, 8 Feb 2019 00:24:37 +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 1grjfL-0008Ke-7n; Thu, 07 Feb 2019 13:24:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1grjfJ-0008KX-S9 for kernel-team@lists.ubuntu.com; Thu, 07 Feb 2019 13:24:29 +0000 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1grjfJ-0004dk-LB for kernel-team@lists.ubuntu.com; Thu, 07 Feb 2019 13:24:29 +0000 Received: by mail-ed1-f69.google.com with SMTP id b3so4403503edi.0 for ; Thu, 07 Feb 2019 05:24:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:openpgp:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=corYXIDLoy/t8nN6/Ovf/6Doi5Nwj0qXYk0KdutLwRg=; b=ME1GRqjLGlxlp4VEotFJwVl0nVuGUtFt1KoS2sJGvSs1OpOGo23OUeJkfU1HzEdG5n NEKMDt/BkI9k6GO8TyUsVgHp5q0lfIQi9pUev+qrQ5bW0EPrrKLfRmHeqoC5vOmvDIh4 WcV/SxWpF6QckDRtYWZ6niY4+e2LBgorUFZyvWn6cbQe9Vgn4FhsQrKwE6x2pEyV6n9O 7F+Ly3mxo48vGv0KZ74VKZSU4WnZWFpvxzy+9BcH3Ga/0udRmg0dQmCmWoCijEIQATbu VclFqp3y0/eHt+d7Rs84EXkU/2jRxsr+M6dquqz4WsTRl7rLuGf03p0z81jtLLqhph8f qcUw== X-Gm-Message-State: AHQUAuYNGFMFFFncx7+MhLL9M9BUvxLstsucXq6ROccCHkAPQHZG+62c Lkd8ipMAk1rJD+GlTmXUNNmZi8Qym3YibeFaoc3/wG3OX1q7aoMZlppprBbRTfy/ZLUgMeIV+rP 5LZmgkzs1sYDmud27pReLtd/ilAuLNnFLN6V2zPsJQQ== X-Received: by 2002:aa7:d8c8:: with SMTP id k8mr6649251eds.176.1549545868861; Thu, 07 Feb 2019 05:24:28 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ2Kb2NNq/HwwzqE+qsFZIyZcG5OA4hHS3ygQ3/I85OPW1iT6t06+2Zu79bOIcFQpeq/Vr1Bw== X-Received: by 2002:aa7:d8c8:: with SMTP id k8mr6649234eds.176.1549545868562; Thu, 07 Feb 2019 05:24:28 -0800 (PST) Received: from ?IPv6:2a02:8109:98c0:1604:bdd7:1271:cbca:cb34? ([2a02:8109:98c0:1604:bdd7:1271:cbca:cb34]) by smtp.gmail.com with ESMTPSA id b13sm2760108eja.74.2019.02.07.05.24.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 05:24:27 -0800 (PST) Subject: APPLIED/cmnt: [trusty/linux-lts-xenial SRU] [PATCH 0/2] switch to a signed-only kernel and add buildinfo To: Andy Whitcroft , kernel-team@lists.ubuntu.com References: <20190205103227.6048-1-apw@canonical.com> From: Kleber Souza Openpgp: preference=signencrypt Autocrypt: addr=kleber.souza@canonical.com; prefer-encrypt=mutual; keydata= mQENBFjjmLgBCADW/wnobGtt4lIvs0nkVbvecpvmvH6j7oFy92KxnAVPr4akWmLwLHH8id1k tKJlR1KlINf089anZfIK9uC6lFWjlmrg94U+9zZHUlG+MdLeJrqRWJAxqjz2DT3EYq9vDpxt uLaZws5EAWvxswa9oTtbwIWA1sqeps5DWUw95zFGeaxS/hisdlywU5G+I/pKLNkwTMyjwICC gHuUvCNuuOt5ZDu3i6Z76XKedu6YyWSVquesMzWAt6XO3QTXLB2b67eqalxxbTSHdkzrt5sR Ai4BQhr5d3jziYWRK5tPi+nj72/kWv0C12WQqzSFOZ5rYEZu3Ypyu+t4AoTzJ1GpzZEhABEB AAG0NktsZWJlciBTYWNpbG90dG8gZGUgU291emEgPGtsZWJlci5zb3V6YUBjYW5vbmljYWwu Y29tPokBVwQTAQgAQQIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgAIZARYhBPLtrW77uQZf 0wPbYUaq8zVw4RYrBQJcDjXSBQkFC9CaAAoJEEaq8zVw4RYrIDcIAJX/8QBmtOFTbQWeKoCr FTLVu1DDMd7av/cCT7L4JOMfRQ6rXrPyhsgyqVW4l5l+co+OXFidpWBJBCAGun95nkKY4sK6 JIL2MXq8KiUQMBGXuMuvrzPOK5V04BR2vjYhYdFFppnluRl5cbAVbHK+HMvcXXzjfWLb2Zmr 5x1j0ZtuJOUsoHWQQeJwtDufSgaW6fOWJg76vVx6gvd2pZ9P2ZIr0zKA2fxQZ7WD+pLTfBly 81ktHD0XwOF4g3LPzcjuOuP+aNb757YZcCMi2/3zy+07QkNmaqg3sYYu9ISegNta6bESsdvx uhcsQYDt4ebzu29e7t5YYoncKIW+UllnsKG5AQ0EWOOYuAEIAMJqK7zV//x1PaUVVnJiSoEZ FBCOoZelEajq4veDVUEUoOvXCVv93aQEnAZtb4wqAlGtZKGn74oaxgVjRLvUIUFWRf+FvcWh mzO2geaTmRQ4W5XdFeCymNmuwDVIH90ZjwFFZI5Mc6lFX8k4eBPhxNxXuhM+8rHWpiHVwUap /YqYxyvEP88BVrQqZQgwQjGVDE9PNIOwPUsYGdhSd+8lvFP2ygVR3BhlLT9aAJqsGRyQWEuj CA5/xyTRi1nfF/cAUQkfFCXHj0Hiddw0zTclBuWdZzqdQZwF64e4OwAy+XtJ6lYeuHM/Ztxg ebWFnWILqZLLowCwp2inyZeXC1IuTQcAEQEAAYkBHwQYAQgACQUCWOOYuAIbDAAKCRBGqvM1 cOEWK2ZQCACByBGwoXsqfSZB+lnkTp5dV1aQ+peC7T+I8GQKVvckFVv3lv73ibm1uBNrnRjO A6802JneP1M8Qo8h1olc0iXyXnIpnMz1dZBsj5VJoYRMes6UB96PuafdNKnVo6XYc9xE0QMR CIUoZ37nC7gMCgAhM5eY4SjMxjy8aXiNpWt7WGCZoCvRSrWn0CrWGvMriXbqHf5/PHhoOGCR rK1PlxFYriuuBtGUP/kAy2rzT4B5NywXrAHg4IrgMxEdYHy6LiutpSRKmFHwO4IAmB8pUrbe wJxW6Rkg2c10vzfvPChs8bedvyb8eioU19QS0prjxywrWie6fwT5NqGmE6Nv4+kA Message-ID: <286ba634-a69f-21de-dd40-a65bea75863e@canonical.com> Date: Thu, 7 Feb 2019 14:24:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190205103227.6048-1-apw@canonical.com> Content-Language: en-US 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" On 2/5/19 11:32 AM, Andy Whitcroft wrote: > Below are the two patches needed for the trusty/linux-lts-xenial > backport kernel to match the signed-only and buildinfo patch kits > applied to xenial/linux. > > Note on the next rebase there is a trivial collission in packaging for > udebs; you should simply take the new bits from the primary packaging > and then apply these two on top. > > -apw > > Andy Whitcroft (2): > UBUNTU: [Packaging] drop redundant = from define statements > UBUNTU: [Config] resync flavour-control.stub > > debian.xenial/control.d/flavour-control.stub | 47 +++++++++++++++----- > debian/rules.d/2-binary-arch.mk | 6 +-- > 2 files changed, 38 insertions(+), 15 deletions(-) > Applied to trusty/lts-backport-xenial branch, with the BugLink added and the following fixup for patch 2/2:  Conflicts: linux-image=SIGN-PEER-PKG=-PKGVER-ABINUM-FLAVOUR  Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools, linux-headers-PKGVER-ABINUM-FLAVOUR Thanks, Kleber diff --git a/debian.xenial/control.d/flavour-control.stub b/debian.xenial/control.d/flavour-control.stub index 8cd24d4ac0cf..b0c41cce9ddd 100644 --- a/debian.xenial/control.d/flavour-control.stub +++ b/debian.xenial/control.d/flavour-control.stub @@ -27,7 +27,7 @@ Architecture: ARCH  Section: kernel  Priority: optional  Provides: linux-image, fuse-module, =PROVIDES=${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base, linux-modules-PKGVER-ABINUM-FLAVOUR +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~14.04.1), linux-modules-PKGVER-ABINUM-FLAVOUR  Recommends: BOOTLOADER, initramfs-tools | linux-initramfs-tool