From patchwork Tue May 14 13:37:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1099479 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 453Jf13KfGz9sBb; Tue, 14 May 2019 23:37:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hQXcj-0005pM-Pj; Tue, 14 May 2019 13:37:41 +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 1hQXcg-0005os-P4 for kernel-team@lists.ubuntu.com; Tue, 14 May 2019 13:37:38 +0000 Received: from mail-io1-f72.google.com ([209.85.166.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hQXcg-0001af-9x for kernel-team@lists.ubuntu.com; Tue, 14 May 2019 13:37:38 +0000 Received: by mail-io1-f72.google.com with SMTP id t7so12347760iof.21 for ; Tue, 14 May 2019 06:37:38 -0700 (PDT) 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=vraijwMBabf+mVV9Pw+nOwljrofnR0Vi6AZKOTOIc3Y=; b=Mb2W9+0fO9v5UIHvEnete4A8nc1OXy6vmG4UOBqUB1NOIRyjkuSEvJmR9iiq4u2yXO lw0/TaJ0viYuoMEc/XaJSGOtlR+7gVKY3iZ3FWIMJrZ6BEzDw/MvMoWQEEMdT8xG87en j50QGOxNjE8K46h5S6ZfOZGMzwMWaw8tWvZ2OjxzzEshvf9O0eTv5QGrfZ7ijQEDsXHX qKyUMjXMb5SKZY1Z1G50iPS/lFm3WxIPJmja9p9vn99AEWeWMOsD5fzuyCrXee8UQEtr abx94/GfH4UVZhYVTB2+R2QuM2W7JDSgZ+vh75E8pkcTj7WEkQlCTzTCjTZtxn0B3ca0 7oyA== X-Gm-Message-State: APjAAAUcHZBa0NBcjw0RVpc8Wj+yXsuE1RcBRHNGdyNkf7X6BiQr7AfA pqEPHGGUOxFKX+CcYiJBfAwpk71RGe8WgQgk9svRT7uXiSwOIhNZnyj2ntEvp6AZTw6JXwhGR8X I+Hzzxg9jCwAosnS0HrWkab7HXjSlS9GC+183itNMDw== X-Received: by 2002:a02:ad07:: with SMTP id s7mr21732874jan.103.1557841057067; Tue, 14 May 2019 06:37:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqwetDVdNKCMGdWzkuezg2zuAnAawN8h58b8yIv8JrHPp8JzOvFQVacbNlAv9pLQyEz/CZhrsA== X-Received: by 2002:a02:ad07:: with SMTP id s7mr21732860jan.103.1557841056784; Tue, 14 May 2019 06:37:36 -0700 (PDT) Received: from xps13.canonical.com (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id y99sm821945ita.23.2019.05.14.06.37.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 06:37:36 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH v3 1/2][linux-signed-hwe-edge][SRU Bionic] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION" Date: Tue, 14 May 2019 07:37:21 -0600 Message-Id: <20190514133722.13308-2-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514133722.13308-1-dann.frazier@canonical.com> References: <20190514133722.13308-1-dann.frazier@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" BugLink: https://bugs.launchpad.net/bugs/1824016 I'll be adding UNSIGNED_SRC_PACKAGE in the next commit, so this will keep the names consistent. Signed-off-by: dann frazier --- debian/control.stub | 8 ++++---- debian/rules | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index 0f7579c..d59187f 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -8,7 +8,7 @@ Build-Depends: python3, python3-apt, sbsigntool [amd64 arm64], - HEADERS (>= VERSION), + HEADERS (>= UNSIGNED_SRC_VERSION), Standards-Version: 3.9.4 Package: linux-image-ABI-generic @@ -18,7 +18,7 @@ Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux (= VERSION) +Built-Using: linux (= UNSIGNED_SRC_VERSION) Description: Signed kernel image generic A kernel image for generic. This version of it is signed with Canonical's UEFI/Opal signing key. @@ -30,7 +30,7 @@ Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux (= VERSION) +Built-Using: linux (= UNSIGNED_SRC_VERSION) Description: Signed kernel image lowlatency A kernel image for lowlatency. This version of it is signed with Canonical's UEFI signing key. @@ -41,7 +41,7 @@ Section: debian-installer Priority: extra Provides: kernel-signed-image Architecture: amd64 arm64 ppc64el -Built-Using: linux (= VERSION) +Built-Using: linux (= UNSIGNED_SRC_VERSION) Description: Signed kernel image generic for the Debian installer A kernel image for generic. This version of it is signed with Canonical's UEFI signing key. It is intended for the Debian installer, diff --git a/debian/rules b/debian/rules index 926c4ae..733f106 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ pre-clean: sed debian/control \ -e "s/HEADERS/$(src_headers)/g" \ -e "s/ABI/$(src_abi)/g" \ - -e "s/VERSION/$(src_version)/g" + -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g" rm -rf ./$(src_version) UNSIGNED SIGNED rm -f debian/linux-image-*.install \ debian/linux-image-*.preinst \ From patchwork Tue May 14 13:37:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1099481 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 453Jf91KLzz9sMQ; Tue, 14 May 2019 23:37:53 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hQXcq-0005rq-Vw; Tue, 14 May 2019 13:37:48 +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 1hQXcm-0005qj-0z for kernel-team@lists.ubuntu.com; Tue, 14 May 2019 13:37:44 +0000 Received: from mail-it1-f199.google.com ([209.85.166.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hQXcl-0001aw-KC for kernel-team@lists.ubuntu.com; Tue, 14 May 2019 13:37:43 +0000 Received: by mail-it1-f199.google.com with SMTP id u131so2508020itc.1 for ; Tue, 14 May 2019 06:37:43 -0700 (PDT) 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=VuWOMfJ3C7ZFAl1XY0ZviWuLys+eCg+ThlJjSpDFViA=; b=pOZ1jgfbzLlP1XNC3nl7tOGVwPYgv19rCpphp/t5FzZppOF2VOyos1Vv6iVOpRwqx1 NKOLG7UioH3mLaKL7UF2qP7GdB84RZTjD5RVnuCLaVW1PCqIm17rtPypxkr91mf2dO7H 90cHTlTJfY4vduvTr+rpbshE+jvOkAgZz6mDNIdsWr4tDLh7LlhuzmJ2wDZqW3WDrEd4 3CUGM71tuCMfcY0dr6Ia3+p/FIXE1xPGc7sM0eJoDgZA4mwnstlVj0jIEKDbsUvbSmeo NLJ1hCju0Ab8Z0R1I+Hsm1wBwXZ8hQng0Xzj44alb4Ycjzz70o6uoUIXHURYQEeGux5s A6fw== X-Gm-Message-State: APjAAAXRlLS06WXRUg94NIWXmFSlEoZ2+m6+0GuNcjL0HTeFTien/0QS ut0u4zs+2Nk6mzjg4JGX81mkzpDeYw+ZJbjbX6d01ujMxYGXO+rmw1mLRFAwMK/Mxm/8CmnJi0C TiGQEMHO7tHEUiIZA5V9sujWn0WTTPhnjlgPXZPbTHw== X-Received: by 2002:a02:ca13:: with SMTP id i19mr22594456jak.77.1557841062440; Tue, 14 May 2019 06:37:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqwronCHZO03vPjlGpVMx+mUcTE5emKolHD4J4XXsKRp8THMRsQ9URHwj/tM/gjNy+iSSzk0IQ== X-Received: by 2002:a02:ca13:: with SMTP id i19mr22594439jak.77.1557841062163; Tue, 14 May 2019 06:37:42 -0700 (PDT) Received: from xps13.canonical.com (c-71-56-235-36.hsd1.co.comcast.net. [71.56.235.36]) by smtp.gmail.com with ESMTPSA id m25sm1127684iti.24.2019.05.14.06.37.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 06:37:41 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH v3 2/2][linux-signed-hwe-edge][SRU Bionic] UBUNTU: Use the correct source package name in Built-Using field Date: Tue, 14 May 2019 07:37:22 -0600 Message-Id: <20190514133722.13308-3-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514133722.13308-1-dann.frazier@canonical.com> References: <20190514133722.13308-1-dann.frazier@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" BugLink: https://bugs.launchpad.net/bugs/1824016 Signed-off-by: dann frazier --- debian/control.stub | 6 +++--- debian/rules | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index d59187f..1721803 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -18,7 +18,7 @@ Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux (= UNSIGNED_SRC_VERSION) +Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION) Description: Signed kernel image generic A kernel image for generic. This version of it is signed with Canonical's UEFI/Opal signing key. @@ -30,7 +30,7 @@ Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} Conflicts: ${unsigned:Conflicts} Provides: ${unsigned:Provides} -Built-Using: linux (= UNSIGNED_SRC_VERSION) +Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION) Description: Signed kernel image lowlatency A kernel image for lowlatency. This version of it is signed with Canonical's UEFI signing key. @@ -41,7 +41,7 @@ Section: debian-installer Priority: extra Provides: kernel-signed-image Architecture: amd64 arm64 ppc64el -Built-Using: linux (= UNSIGNED_SRC_VERSION) +Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION) Description: Signed kernel image generic for the Debian installer A kernel image for generic. This version of it is signed with Canonical's UEFI signing key. It is intended for the Debian installer, diff --git a/debian/rules b/debian/rules index 733f106..17f7ab2 100755 --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ pre-clean: sed debian/control \ -e "s/HEADERS/$(src_headers)/g" \ -e "s/ABI/$(src_abi)/g" \ + -e "s/UNSIGNED_SRC_PACKAGE/$(src_package)/g" \ -e "s/UNSIGNED_SRC_VERSION/$(src_version)/g" rm -rf ./$(src_version) UNSIGNED SIGNED rm -f debian/linux-image-*.install \