From patchwork Sat Apr 27 21:17: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: 1092096 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 44s3fm1w4fz9sCF; Sun, 28 Apr 2019 07:17:52 +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 1hKUhe-000141-R9; Sat, 27 Apr 2019 21:17:46 +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 1hKUhc-00013K-4i for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:44 +0000 Received: from mail-it1-f198.google.com ([209.85.166.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hKUhb-0001Si-Mo for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:43 +0000 Received: by mail-it1-f198.google.com with SMTP id z125so6289002itf.4 for ; Sat, 27 Apr 2019 14:17: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=TTWRbmvnsSLMWTiaGY0Rnvd9IjOt+ZSO22kDA0YlXjQ=; b=S1rsPBG4RLqprh21KlJYN9NG1ehFw0tJLKaR6G9Ky41NxzgkwlVoX4tVoAVUlAw2iR GY6uoazHtKkSzHL47YEmagp2TLSPE1puQ+s4O31mX853O14oxzTXyN9D01ZkhbSgfD9R pX1GGDQi+IxAWfb2swJaEdXqfSFhK9EjaW+fyDshqr8dF/ocfNTJFZ6mdo2DeXZtxhsy JcNGhlVvxzAuFYUcQ4vzfHgRQaZXud9W05f7pNDXomPJOpIRSrbC8kY3UBTTvcVq3U9/ dXFlNtF594EIwBmOJBtxu85zLe45tCv8AG+nUAAnY3iCGqwD50ZiqFCM5dRWgX5wvZhf 1juQ== X-Gm-Message-State: APjAAAUR/4hxBuiI8tOyIQpNgSj+XCwIZ1gefrEyTy3+2LZ0YSeVq0Hl Lqza6EWitK6GXMy+WJbHl8tp3zAqbjM5WEm1QsTiXDk6i3Des98xdG0OKKBi32NkOaYhgV6BD12 AnSBCJJnk37FSn4zPOF38y2HFrmnvqhnA/cxNfjLirQ== X-Received: by 2002:a02:b88b:: with SMTP id p11mr35657436jam.82.1556399862557; Sat, 27 Apr 2019 14:17:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtKnzKhmGiWMgvWAq2OcpT+mCxSjhAi5V7CoMfTuwwGfQsfUlkfQ7C2h/sPaeISFTm2vJ8hA== X-Received: by 2002:a02:b88b:: with SMTP id p11mr35657420jam.82.1556399862296; Sat, 27 Apr 2019 14:17: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 i24sm1962545ioh.60.2019.04.27.14.17.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 14:17:41 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/6][linux-signed][SRU Cosmic][SRU Bionic] UBUNTU: Use the correct source package name in Built-Using field Date: Sat, 27 Apr 2019 15:17:21 -0600 Message-Id: <20190427211725.4796-3-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190427211725.4796-1-dann.frazier@canonical.com> References: <20190427211725.4796-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 6c7d775..34a37c7 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 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 1f2083f..62c132c 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 \ From patchwork Sat Apr 27 21:17: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: 1092100 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 44s3fn0N9Pz9sNM; Sun, 28 Apr 2019 07:17:52 +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 1hKUhh-00014u-08; Sat, 27 Apr 2019 21:17:49 +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 1hKUhd-00013o-TH for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:45 +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 1hKUhd-0001Sm-EK for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:45 +0000 Received: by mail-io1-f71.google.com with SMTP id h10so5689313iob.2 for ; Sat, 27 Apr 2019 14:17:45 -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=+QthxkPFybVYSTafUznQTP0V8nCp+9rYqmrjasBZow8=; b=HQHeNebT8rlTKiV6uXIaZ9FMQrSqhSgvq0e2doEAukYRMGVgTNjXz1j3soOMbHKLtN 4RznDYdBaF8hxs185ZKcCXkJ26XgbafJNrFkYewEFM90Df2affIFx9SDEUcp2pE8PZWy Uyz7mOM9d1/XkwlxAMidrs+OtZ+Wmixajf85HkqNYgwW0fK7utX0dtN0ULB45eL3hB9w S0YQtqWc5+SQ9RXPFKEg03ErYk/07WdPJUe/NYxkuBgkR9IWPocEHFKbf8QzGiM44Tw4 9yev7O78OOV3wZz8bIO07GXPV5XgywN7jn50YSRQKnIoJDeDziwNpbLtYxN/f3CZ75Zx 2JEQ== X-Gm-Message-State: APjAAAWdj5ppLVdshP4Lucs+nEcDV3Izv8YFlpgyodiEnH2f9pXkNEgK cf5QQlM5zvSg6EhWUe/jjNWuZiXqjyIOhKm6U4qiBTJQg4BhG5HJHxCy/hkCMlTwaCPWBFrrTb7 8Oz16L5zy/LOxM3m+a9g686gjSU4CDT6ec1aq/WG3GQ== X-Received: by 2002:a05:6602:20d6:: with SMTP id 22mr29496306ioz.163.1556399864280; Sat, 27 Apr 2019 14:17:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqyOZy6s5pgCQRi4zzwhe4dDIWnRbW0cMl8h6eymX6iJ9dvhN5FRbL/qG74l3pdXOZeaRL89dQ== X-Received: by 2002:a05:6602:20d6:: with SMTP id 22mr29496295ioz.163.1556399863992; Sat, 27 Apr 2019 14:17:43 -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 z141sm12782278itb.7.2019.04.27.14.17.43 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 14:17:43 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/6][linux-signed-hwe-edge][linux-signed-hwe][SRU Bionic][SRU Xenial] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION" Date: Sat, 27 Apr 2019 15:17:22 -0600 Message-Id: <20190427211725.4796-4-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190427211725.4796-1-dann.frazier@canonical.com> References: <20190427211725.4796-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 7fbc480..7e3bb3f 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -8,7 +8,7 @@ Build-Depends: python3, python3-apt, sbsigntool [amd64], - 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 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 Sat Apr 27 21:17:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092099 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 44s3fn02bRz9sNK; Sun, 28 Apr 2019 07:17:52 +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 1hKUhh-00015C-4v; Sat, 27 Apr 2019 21:17:49 +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 1hKUhf-00014Q-Qa for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:47 +0000 Received: from mail-io1-f70.google.com ([209.85.166.70]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hKUhf-0001Sp-C4 for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:47 +0000 Received: by mail-io1-f70.google.com with SMTP id h3so5683526ioh.3 for ; Sat, 27 Apr 2019 14:17:47 -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=qmo54MLFF63TJmwDjVN1BltMv/7CTtqvi70P11eAAyQ=; b=j9WOCsXcVqJjDPq1YHyohLaScmktnYOR2ucNbX2YB9t+xKhLWecR8xGtnrR5+kY0M1 TTyK34po3Rlj5ovMarbKGHlWn59RTpAjQ5GaKZCkaFsNeo+iz+8sZetK65PcdKFjH1pj vv2XSWBQZhNNP0E+nVJDWpP8RzBbUznxjXUAktP+iKr0vo3phXBya6VKle0aQ1QUj7yC dr1ORDt+elEXYoTuz7nSIbaw9A+SHmwj01vy2eM9Yl77SzzwyIpT+lFN5K40X9pGNjAQ +hrAGW5hG95yCGYCjOOYpkDne20znwbr8QXyMybxu/+yy2Ay/QmebNXgoZ4JEL8Ro2sb 7w4A== X-Gm-Message-State: APjAAAUEhwRqvrjvkeydPBomacMKFmc13YOOe+SpyUEyNXzZKb4dvJ/2 DdI4wfz9L+2SAfXgVNagRNqLt6Jm0F7S6mKCKd6vukeDwkZTNyDXQSmInNevwI1kmi3JEPNClc9 NwV7dO8NSHCS6cCwzRo5vHCYGSCuqmtyf2Z6lZ/MNog== X-Received: by 2002:a02:ad15:: with SMTP id s21mr25330805jan.79.1556399866219; Sat, 27 Apr 2019 14:17:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7lwhdusiBOm1zA0t0kyopYgzK9dI4VpuxwC+OSO4o1PlG/A+4Eq6vhLOIVqwQYwyyLcDtJw== X-Received: by 2002:a02:ad15:: with SMTP id s21mr25330789jan.79.1556399865938; Sat, 27 Apr 2019 14:17:45 -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 n199sm11311765iod.54.2019.04.27.14.17.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 14:17:44 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/6][linux-signed-hwe-edge][linux-signed-hwe][SRU Bionic][SRU Xenial] UBUNTU: Use the correct source package name in Built-Using field Date: Sat, 27 Apr 2019 15:17:23 -0600 Message-Id: <20190427211725.4796-5-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190427211725.4796-1-dann.frazier@canonical.com> References: <20190427211725.4796-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 7e3bb3f..bf34683 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 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 \ From patchwork Sat Apr 27 21:17:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092101 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 44s3fq5ghGz9sNQ; Sun, 28 Apr 2019 07:17:55 +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 1hKUhj-00016j-FJ; Sat, 27 Apr 2019 21:17:51 +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 1hKUhh-000153-9n for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:49 +0000 Received: from mail-it1-f198.google.com ([209.85.166.198]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hKUhg-0001Sz-RX for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:48 +0000 Received: by mail-it1-f198.google.com with SMTP id q203so6304397itb.2 for ; Sat, 27 Apr 2019 14:17:48 -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=S0cvLIZ8Bb49/7spRaJcY+xL+i+qiy19xRIeyw2IB6U=; b=ddJ4Pf1GodiJKDhFmLSE4hP1d1GQ2CAcOFxGTE4mSPN1AVfvIdbllEGEvfmtW7Oxfs 3PVvBF5YU780uCPIk1tCtmBthEb3mR6AATHwit6foAIM6hUrSd2T0ASFY+GFhza+oKx9 5GTVDADn9I2JV6xYN/Ep4hDk+L/cX/XDbAx1EhT0EKU3nvGEvkpXb6Vnq+dkJFc/BPZN hyiUQ2j+cANx5X2ZQqwpZx0SVCjHCFv5iMTE7DSggQ1OqVEioVH9Q5jxQ6UxzOYT4kSw 2fdn/374ghQcGHZermuvsZieic9ArcJXJTXFaR32K87OTADQV3o+iTi2KkTWeVJMPZza e+7g== X-Gm-Message-State: APjAAAUsPeAthTYlSztQ+Y99RWvVSLuCHq3GBq/TkO7cpktK3OMzTw3G nYli7kv2DI8bjsAHmly3KgNUTVrgjL9KvWteYbQKwiVrUbLNWq8xzYZ4Pp62dkIDqilPMcVy885 udkkmhKhC/CyLDDfIlrb0p6bZj66hDa+DZ/mMFLu89w== X-Received: by 2002:a02:bb02:: with SMTP id y2mr1749889jan.105.1556399867713; Sat, 27 Apr 2019 14:17:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbSbkgr6DESjL0YKrU2sBOsNkaQjKWcJ4uXpHUPB5Bi4eJTup0ALjYp/O14m7XLFgeALPcpw== X-Received: by 2002:a02:bb02:: with SMTP id y2mr1749879jan.105.1556399867429; Sat, 27 Apr 2019 14:17:47 -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 e8sm13629094itc.23.2019.04.27.14.17.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 14:17:46 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/6][linux-signed][SRU Xenial] UBUNTU: Rename "VERSION" template string to more precise "UNSIGNED_SRC_VERSION" Date: Sat, 27 Apr 2019 15:17:24 -0600 Message-Id: <20190427211725.4796-6-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190427211725.4796-1-dann.frazier@canonical.com> References: <20190427211725.4796-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 69d56d9..ed5fb25 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -9,7 +9,7 @@ Build-Depends: python3-apt, Build-Depends-Arch: sbsigntool [amd64], - 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 -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 844032d..30d3d43 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ test: 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 Sat Apr 27 21:17:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092102 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 44s3fv12MJz9sBr; Sun, 28 Apr 2019 07:17:59 +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 1hKUhn-00019X-BH; Sat, 27 Apr 2019 21:17:55 +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 1hKUhj-00016X-Ek for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:51 +0000 Received: from mail-it1-f200.google.com ([209.85.166.200]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hKUhi-0001T2-Fe for kernel-team@lists.ubuntu.com; Sat, 27 Apr 2019 21:17:50 +0000 Received: by mail-it1-f200.google.com with SMTP id j8so6289716ita.5 for ; Sat, 27 Apr 2019 14:17:50 -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=ytaXExbcwZvQS8pAhrJ4UQp3JQNNclLAy3jZYMpL2Hg=; b=LM92VUvvu4OHgvt/7zeV9eXzyg/Rq0RiOBV+TLvhhNEaWzCZx6Tan6PmoLXeuCwTII 2dai5MXwzKVeeAw61gZuwa+Plct5rYF/Sc3VETAQU4EMJ4ScVUPydNa/nPOEfA8qA5qr y847BJbmbHK4mAMypn/cdBpwoqFzqL0PO+9lNYLMADSqJuUBHrLpqKzbvqCRdqwH7Iyb CKh84r9CtQ+UmmO7x3iL2UHGq/ETEcOiLZV6ZVVBWvnWVwp3MHXUROnp+60ohTQ1smUS QfmUK5eNqZI7iQWCnfsJP+gpxAL9/IvQrX7I/sSntGdNnUo/vd7AdXfw9W3hsgxpGc0r +wgg== X-Gm-Message-State: APjAAAWDZAjbJnG8Os4gj9+TKqJoAFV1PksKem2jVaaQgjvq/lCPa7rk vIp3QDTobwECD/O/D0H0lDcvWzVWkXQ/sxNY35JgWaU6SY5KZSO/5wnZ4GGHy9C6WoHq3XZfc40 IlmRrdnbwoUm5a4hOpFMuVrnXNWglGPA3SENRDqbqBQ== X-Received: by 2002:a24:cd01:: with SMTP id l1mr14398838itg.150.1556399869338; Sat, 27 Apr 2019 14:17:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwHKWRdvXmtmLmXHhmjpW4c3AlJ8FdOKuxQU9Qbye6fr/XFAcFdMFRblIMOiRs6njfOwCORdw== X-Received: by 2002:a24:cd01:: with SMTP id l1mr14398818itg.150.1556399869002; Sat, 27 Apr 2019 14:17:49 -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 u3sm9359454iof.22.2019.04.27.14.17.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 27 Apr 2019 14:17:48 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 6/6][linux-signed][SRU Xenial] UBUNTU: Use the correct source package name in Built-Using field Date: Sat, 27 Apr 2019 15:17:25 -0600 Message-Id: <20190427211725.4796-7-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190427211725.4796-1-dann.frazier@canonical.com> References: <20190427211725.4796-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 ed5fb25..c662b3e 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 -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 30d3d43..a06cf87 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,7 @@ test: 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 \