From patchwork Thu Apr 11 21:50:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1084304 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 44gF8g3y4Nz9s7T; Fri, 12 Apr 2019 07:51:15 +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 1hEhbC-0003zv-3G; Thu, 11 Apr 2019 21:51:10 +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 1hEhbA-0003zO-FH for kernel-team@lists.ubuntu.com; Thu, 11 Apr 2019 21:51:08 +0000 Received: from mail-io1-f71.google.com ([209.85.166.71]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hEhbA-0005Ck-2W for kernel-team@lists.ubuntu.com; Thu, 11 Apr 2019 21:51:08 +0000 Received: by mail-io1-f71.google.com with SMTP id e72so6088852iof.7 for ; Thu, 11 Apr 2019 14:51:08 -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=VJSM2K0P6YXWdxX553/OhTNPoxH7GxpTreIFBOdaojw=; b=XoSoteTeQLT6lsxbLgJBScuQTeSpWvdw6SWNMNuJMI36elRQd6jTdA1D5iA6V9ONTk d5cPToezDtGXJeHePdtz5wzEHGjB2LDD0i2WqKCBR/SsIYKOdSnU3M8FhZZ7XjSdbG/W qJWDLR7MVzvhoMlQnCXCqIJEDWdCh5FzznuH2tzlhQdg1LcC8BG7leYK24C94XM/W0xN LfoGWFYBjKqVry5wPGCqc9SomaJohhcIg/3CTQKlrMCClChIaR26EQgU7/BAsauZfj6b yFzCDeFKn3NFh40M56u7mypyVQSutKVnjQSHmFWrXsapQePLALUUONbwSM5uSCMhRVL4 UVWA== X-Gm-Message-State: APjAAAUJlbv6FM1h0Qbvyr5LbX3+uyyMTxhj1aTHxnddlb9heoNL/lww QI9wcQvruKc8F0C73OT73os567XwweVN845EXT91YVDTU4p4zlkTXVxv9GSLjTtL1aH7VNcT3bJ enoKfd86SXs0JLw8LS+HQcpO/qo/2cZMcWAxlIA+PCA== X-Received: by 2002:a6b:e50d:: with SMTP id y13mr33222751ioc.142.1555019466943; Thu, 11 Apr 2019 14:51:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqwavSI3IQjaR0vHto36jaIIVDW6Kzh6u1z6RFBanhiXrz2/Zzfhu5nKJNyqgln+Wn8VU2Vd5Q== X-Received: by 2002:a6b:e50d:: with SMTP id y13mr33222734ioc.142.1555019466527; Thu, 11 Apr 2019 14:51:06 -0700 (PDT) Received: from xps13.canonical.com (65-114-206-162.dia.static.qwest.net. [65.114.206.162]) by smtp.gmail.com with ESMTPSA id b8sm3334291itb.20.2019.04.11.14.51.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Apr 2019 14:51:05 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/2][linux-signed][SRU][Disco] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION" Date: Thu, 11 Apr 2019 15:50:57 -0600 Message-Id: <20190411215058.9640-2-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190411215058.9640-1-dann.frazier@canonical.com> References: <20190411215058.9640-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 13be911..49e720f 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -9,7 +9,7 @@ Build-Depends: python3-apt, Build-Depends-Arch: sbsigntool [amd64 arm64], - linux-libc-dev (>= VERSION), + linux-libc-dev (>= UNSIGNED_SRC_VERSION), Standards-Version: 3.9.4 Package: linux-image-ABI-generic @@ -19,7 +19,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. @@ -31,7 +31,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. @@ -42,7 +42,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 20b16d7..fa73f42 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[ pre-clean: sed debian/control \ -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 Thu Apr 11 21:50:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1084305 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 44gF8h39S0z9s71; Fri, 12 Apr 2019 07:51:16 +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 1hEhbD-00040e-7z; Thu, 11 Apr 2019 21:51:11 +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 1hEhbB-0003zm-Tt for kernel-team@lists.ubuntu.com; Thu, 11 Apr 2019 21:51:09 +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 1hEhbB-0005Cr-GH for kernel-team@lists.ubuntu.com; Thu, 11 Apr 2019 21:51:09 +0000 Received: by mail-it1-f199.google.com with SMTP id z125so6810629itf.4 for ; Thu, 11 Apr 2019 14:51:09 -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=tr97nyGKSTxkqxWCwyTSGqD7vb8Tqkcz+y34/iWDg3I=; b=kTRNj+QXj55m2TAWxBL9soPktUZCC4rNvmWsXKp4qKG4dZIpbWft1SbwxGIRSNgvlX y2ydgbRW+ixAG7puvYxbD+W5DolrZusQ+ekI90Z63lHoPXM4AegLadSVQwJKdTo9yOxE Z0evXODvPRlAhG2zERA1wotcbtT1GeIiUhMURsvypSsTsKR/l9SMY+YefoENdrWH1B/+ QBmaCvwpc9SuHq8mZHVSTsScWRzS6k/IaPf2/h1vfpqt7FL/05hNLP7mOT3l62jY246p L2cV2cemyN+e85XaHMHXjBjR5DHY6QoboNIQTu6E7JWIZZe6cMHwGFXnpBsI5CQD4k02 3b3A== X-Gm-Message-State: APjAAAUXWo/QCvZmA0NdjjW1TlUT2ZuLOyPYOlZdek7RkAXVwkWdrl4m AHcItiaLdQb/GqPtyHIlo29u31n+LsgWLXP/e/Tt1EeVcrp07X+go4Q0K12DHo+g7CQtP7v1SWY yk8oqajsTD3sSjBA+YtfBfCWMZP80WWRdP3wJPj3T1w== X-Received: by 2002:a24:2cd2:: with SMTP id i201mr10084896iti.17.1555019468374; Thu, 11 Apr 2019 14:51:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqyurlcQnii8EMx9XyMRyKHADZ4CrIrTEdebCEhFvGljbLfaCG8X3p8th2FhT8CLXCUkyQHYkA== X-Received: by 2002:a24:2cd2:: with SMTP id i201mr10084883iti.17.1555019468085; Thu, 11 Apr 2019 14:51:08 -0700 (PDT) Received: from xps13.canonical.com (65-114-206-162.dia.static.qwest.net. [65.114.206.162]) by smtp.gmail.com with ESMTPSA id g70sm3153371itg.40.2019.04.11.14.51.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 11 Apr 2019 14:51:07 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 2/2][linux-signed][SRU][Disco] UBUNTU: Use the correct source package name in Built-Using field Date: Thu, 11 Apr 2019 15:50:58 -0600 Message-Id: <20190411215058.9640-3-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190411215058.9640-1-dann.frazier@canonical.com> References: <20190411215058.9640-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 49e720f..a4b98d6 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -19,7 +19,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. @@ -31,7 +31,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. @@ -42,7 +42,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 fa73f42..a4a8e0c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[ pre-clean: sed debian/control \ -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 \