From patchwork Mon Apr 29 16:54:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092687 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 44t9k43GGJz9s6w; Tue, 30 Apr 2019 02:54:34 +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 1hL9Xx-000270-Of; Mon, 29 Apr 2019 16:54:29 +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 1hL9Xw-00026i-EI for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:28 +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 1hL9Xw-0007sH-3r for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:28 +0000 Received: by mail-io1-f71.google.com with SMTP id i84so9272271iof.13 for ; Mon, 29 Apr 2019 09:54:28 -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=PqgRz/i9b6jam0aW34Uoof244i0w3NpGxs5L2pX2MyU=; b=kiCK6NB2WjUIHeTJwLnYS+PTUWEoSUzqvFHhxiwFQdYkLD5AsiFcm+22A3tTkdhGxK 7vgumLK6bjx5O0TRnPGoFVaAiEpvZBeZ6l2SxItn5QWbVl1S78FSr3+7snZLluuD1DwZ rm7I8ChZBgHVQD1JlcVLmVh3YoGgqSzgqHkUV67D/pOLcz0mULspNqb5Z2Wns417z7uw ZdbYFHp0gZtSTSOqc/gtJkeRjva6Xi5iR+RCfs2z0SAyGjo0BXjxo+X1Tt3JCOCYDzMk s8r9FN7/I/QUleM+p9qalVVHWGO5EEnIxX+DMpLmTeg+5JiPyWGOTQmAN8IIVYhNKFWh vN2w== X-Gm-Message-State: APjAAAW2PFHN8vYx/pnFT4qY+8kSwV7yz9cYGCK45xyTpDNNYUzJI8TA 7Svcdnjnqp3gujVSeJAO+rhvStBGFbOiUb1FaAuX48wu5VbEww4DfO7AKCWkXbo4aBBJYjSxANJ KckearFfeTkIDYkhSejBcBIKyI68oGjAhIeBIeNeT1Q== X-Received: by 2002:a24:ac56:: with SMTP id m22mr31192iti.25.1556556866985; Mon, 29 Apr 2019 09:54:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqwKF81C2BBp+bUta+BZy+goACcXxhQgBGEa+7z6Fo+odUWh6vloJOcd73mUOns3yvfk4QQAEQ== X-Received: by 2002:a24:ac56:: with SMTP id m22mr31175iti.25.1556556866703; Mon, 29 Apr 2019 09:54:26 -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 n26sm11331483iog.23.2019.04.29.09.54.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 09:54:26 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/5][linux-signed][Unstable][Eoan] UBUNTU: Use dpkg-parsechangelog -S instead of piping to grep/cut Date: Mon, 29 Apr 2019 10:54:10 -0600 Message-Id: <20190429165413.9337-3-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429165413.9337-1-dann.frazier@canonical.com> References: <20190429165413.9337-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" Signed-off-by: dann frazier --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 26a367f..22cec29 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,8 @@ DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) # Work out the source package name and version. We assume the source package # is the name of this package with -signed stripped. The version is identical # to this package less any rebuild suffic (+signedN). -src_package := $(shell LC_ALL=C dpkg-parsechangelog | grep ^Source: | cut -d ' ' -f 2 | sed -e 's/-signed//') -src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) +src_package := $(shell LC_ALL=C dpkg-parsechangelog -S Source | sed -e 's/-signed//') +src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog -S Version) src_version = $(shell echo $(src_fullversion) | sed -e 's/+signed[0-9]*.*//') src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') From patchwork Mon Apr 29 16:54:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092690 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 44t9k45Zqkz9sN9; Tue, 30 Apr 2019 02:54:35 +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 1hL9Xz-000283-Ub; Mon, 29 Apr 2019 16:54: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 1hL9Xy-00027E-D4 for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:30 +0000 Received: from mail-io1-f69.google.com ([209.85.166.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hL9Xx-0007xm-Tj for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:30 +0000 Received: by mail-io1-f69.google.com with SMTP id b16so9259615iot.5 for ; Mon, 29 Apr 2019 09:54:29 -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=m4TrAUgeFZOWlW1IFTbdD/auqMbdpH+zGZz/EyVMaW0=; b=fPrDn/pkoivfIOtcortNiAGTA2398VGHkew6E5Knz56upLaT+prNh7itR/TRiZV13R 6CdQfFHvXWs3Y1csBYc+0mpnJlDHQN5NoBXEP7359G8/uBoUK5rXNe1N/G9m0Bo0lHRh fIsInKbQPiPA6NNb6L2T86viMUtvWbgCOSkjuq4n0FlIseJ1yk5Qmzuso/iA0s5ZhBkL m6Z1gs7FZ7fiNS3NrBBD6hVyytJmPCLosqJUVI2k1ZT83FMHS2aKGH/ye8E3X8APdF6b kfR23Qnpx1eaDH9QYRc4WdM/DoRjVR61tLzWW1L6+q8xNU5iupuH0DJWQVQu5/gSleXb /jlw== X-Gm-Message-State: APjAAAV7ZjLdcifU6AmsF3Zp2OSAYOpkVO8RjCHLUpO1jV0tzOX+OMVz DBqFi+IkaWW9TiB8WGWGg0FAsEetGQ/HkxrY7MuHN9GWWeRbr5jCzVAkT13Qb+EGVxNn0cnzh13 FMCJS8uA9D2NrFT7jyu1Le5eKiNr3buuK/L/tSG0x7w== X-Received: by 2002:a24:ce44:: with SMTP id v65mr33240itg.146.1556556868775; Mon, 29 Apr 2019 09:54:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIIvOITW/h+JpYqr9YR98p/2BEXCDZRmSWvijVJ6ccGrzMuVjvfNJ6oAHLd/BBYouDx3saMA== X-Received: by 2002:a24:ce44:: with SMTP id v65mr33216itg.146.1556556868494; Mon, 29 Apr 2019 09:54:28 -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 g126sm23969itg.36.2019.04.29.09.54.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 09:54:27 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/5][linux-signed][Unstable][Eoan] UBUNTU: Don't see LC_ALL=C when calling dpkg-parsechangelog Date: Mon, 29 Apr 2019 10:54:11 -0600 Message-Id: <20190429165413.9337-4-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429165413.9337-1-dann.frazier@canonical.com> References: <20190429165413.9337-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" It has no impact on the output of these commands. Signed-off-by: dann frazier --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 22cec29..c6d8419 100755 --- a/debian/rules +++ b/debian/rules @@ -7,8 +7,8 @@ DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) # Work out the source package name and version. We assume the source package # is the name of this package with -signed stripped. The version is identical # to this package less any rebuild suffic (+signedN). -src_package := $(shell LC_ALL=C dpkg-parsechangelog -S Source | sed -e 's/-signed//') -src_fullversion = $(shell LC_ALL=C dpkg-parsechangelog -S Version) +src_package := $(shell dpkg-parsechangelog -S Source | sed -e 's/-signed//') +src_fullversion = $(shell dpkg-parsechangelog -S Version) src_version = $(shell echo $(src_fullversion) | sed -e 's/+signed[0-9]*.*//') src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') From patchwork Mon Apr 29 16:54:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092691 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 44t9k617kGz9sNM; Tue, 30 Apr 2019 02:54:37 +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 1hL9Y2-00029v-8R; Mon, 29 Apr 2019 16:54:34 +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 1hL9Y0-000286-64 for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:32 +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 1hL9Xz-0007z6-Qd for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:31 +0000 Received: by mail-it1-f198.google.com with SMTP id x143so52204itb.9 for ; Mon, 29 Apr 2019 09:54:31 -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=Ayn6RXEzG2Iv+QIOaAX63UVecgEUEUf1Q68Y4CFbMhI=; b=AH/WS7i4G4SRAM8mEZuBl47N9aHzcYgvT2errBYZdQ4EG69rRwwWvMnMIBOuNgnB23 jBkW5o57aBYRnNRoARhiebrVilivum8fkT9mrji+qvEiSpjNtpROFJz0UT8fkvz/1uOT +/PFmjeGaDBGKBtE9sNxuR14FLUKsYJSK2IQDZ6/q1qC2QR0fDvDASOED2molL0ijOAc af/6OusLPnNw4dj5BLexYQ29uXWEY4mCRj86UZEeLturt7q8tuB0al3H3zO6NlN27y7X 7y4MsjhFzYGBaPLWlxdpy52cinjBSbh751UFwzwN/K2ujdy022L5FQK3qZgpjEu/nTBu 8x+Q== X-Gm-Message-State: APjAAAXUiHlx8mXGG/I+aViVdoEYOZya5RZOZtspLgwHGff3pKuLBwCz vQxDL40r6JdGXTaGJShvpmVL1aP8XeUC7bAZpYLIv0+YxNqiEMyWN8PFLw1ws31QOrGdvhLl7yL JfiXoh2TFLF3j82Zg9PHRbKhzms9yMiXyXu5cF/P+mQ== X-Received: by 2002:a05:660c:209:: with SMTP id y9mr29046itj.31.1556556870669; Mon, 29 Apr 2019 09:54:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqzqbwqAYys4RFfceD2CdZJ7V9aKoFjl+97yugigcoY+GFrNMiqo5z9kuyu+I15xMI/FpQsbmg== X-Received: by 2002:a05:660c:209:: with SMTP id y9mr29025itj.31.1556556870344; Mon, 29 Apr 2019 09:54:30 -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 t127sm23043itb.32.2019.04.29.09.54.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 09:54:29 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 4/5][linux-signed][Unstable][Eoan] UBUNTU: Change one-off ":=" to a "=" for consistency Date: Mon, 29 Apr 2019 10:54:12 -0600 Message-Id: <20190429165413.9337-5-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429165413.9337-1-dann.frazier@canonical.com> References: <20190429165413.9337-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" Signed-off-by: dann frazier --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index c6d8419..395eedd 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) # Work out the source package name and version. We assume the source package # is the name of this package with -signed stripped. The version is identical # to this package less any rebuild suffic (+signedN). -src_package := $(shell dpkg-parsechangelog -S Source | sed -e 's/-signed//') +src_package = $(shell dpkg-parsechangelog -S Source | sed -e 's/-signed//') src_fullversion = $(shell dpkg-parsechangelog -S Version) src_version = $(shell echo $(src_fullversion) | sed -e 's/+signed[0-9]*.*//') src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') From patchwork Mon Apr 29 16:54:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 1092692 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 44t9k85VnRz9sCJ; Tue, 30 Apr 2019 02:54:40 +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 1hL9Y4-0002BS-G7; Mon, 29 Apr 2019 16:54:36 +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 1hL9Y1-00029Q-U8 for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:33 +0000 Received: from mail-io1-f69.google.com ([209.85.166.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hL9Y1-0007zB-Ie for kernel-team@lists.ubuntu.com; Mon, 29 Apr 2019 16:54:33 +0000 Received: by mail-io1-f69.google.com with SMTP id i20so3467995ioi.20 for ; Mon, 29 Apr 2019 09:54:33 -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=FqPrM3vMHG2qIrmaP/e0Hs/Daeu0gaKbvwh1z1Nhqns=; b=OgH/eZn/bTKTAV1tjQvyhlqURGwHgXsjqYE5Hz+20guE3g4FtWYyu2ITmEPIXvju4l OhRslgOAWk96d1+grk/JqIsyRcrOeXBAM7/UkiwtWZgVndLxERGpUatHExTtamuEp9q6 CorYOUDZ/8H6otebfs2+UYAn0pPMhqAMVjhvYlrCuR7CaSsBo8vooeeOkSPo30J/dPRa rbwqvRUfMNyPwWla8xBTpSbSoJ8bwplY4oZNCHe4atpgiXZl1dlDj5LdPDYhwuc7pBa3 ofrdKBjwcofRQTsI1IX8kKbVLGjzbd9SN+5IQGISeIcGf2V9LwbLyTXXr+JscwhS/md9 3lNA== X-Gm-Message-State: APjAAAX3ozkMrQnIO84bb385IcsofuzPzJ198nK/50rc0xk0wpRk1fgI LPRCRcI0/vvxnGr4TuyxwJCmQldsl8xsWd13ad6MXDZ2qS1vk+LMPGf0A6oUnI7zmEKmxfWEYqs uKlJMFt8EIupyl6/DhlBFoMqMXX9TeIx6mhL6BLnFZQ== X-Received: by 2002:a05:6602:d0:: with SMTP id z16mr35415456ioe.109.1556556872344; Mon, 29 Apr 2019 09:54:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqyaZSuJhOe1DK5b8Hs1/5E34+Gyk3hlQWTd4cOhcPs/ezwXPZXiJ/02TI+jkrUIB+/rcs7lvw== X-Received: by 2002:a05:6602:d0:: with SMTP id z16mr35415444ioe.109.1556556872029; Mon, 29 Apr 2019 09:54:32 -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 q12sm9602838iog.85.2019.04.29.09.54.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Apr 2019 09:54:31 -0700 (PDT) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH 5/5][linux-signed][Unstable][Eoan] UBUNTU: Rename variables to distinguish signed vs. unsigned metadata Date: Mon, 29 Apr 2019 10:54:13 -0600 Message-Id: <20190429165413.9337-6-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429165413.9337-1-dann.frazier@canonical.com> References: <20190429165413.9337-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" The difference between $(src_fullversion) and $(src_version) is not self-evident. Use short names for metadata vars about this package, and prefix those describing the unsigned counterpart with "unsigned_". Signed-off-by: dann frazier --- debian/rules | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/debian/rules b/debian/rules index 395eedd..b5a64c7 100755 --- a/debian/rules +++ b/debian/rules @@ -4,22 +4,24 @@ DEB_HOST_ARCH = $(shell dpkg-architecture -qDEB_HOST_ARCH) -# Work out the source package name and version. We assume the source package -# is the name of this package with -signed stripped. The version is identical -# to this package less any rebuild suffic (+signedN). -src_package = $(shell dpkg-parsechangelog -S Source | sed -e 's/-signed//') -src_fullversion = $(shell dpkg-parsechangelog -S Version) -src_version = $(shell echo $(src_fullversion) | sed -e 's/+signed[0-9]*.*//') -src_abi = $(shell echo "$(src_version)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') +src = $(shell LC_ALL=C dpkg-parsechangelog -S Source) +ver = $(shell LC_ALL=C dpkg-parsechangelog -S Version) +abi = $(shell echo "$(ver)" | sed -ne 's/\([0-9]*\.[0-9]*\.[0-9]*\-[0-9]*\)\..*/\1/p') + +# Work out the source package name and version of the unsigned package +# By convention, it is the name of this package with -signed stripped. +# The version is identical to this package less any rebuild suffix (+signedN). +unsigned_src = $(shell echo $(src) | sed -e 's/-signed//') +unsigned_ver = $(shell echo $(ver) | sed -e 's/+signed[0-9]*.*//') # We build our control file. This has to be done before dh runs otherwise # we have no binary files and we will not run the appropriate targets. 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 + -e "s/ABI/$(abi)/g" \ + -e "s/UNSIGNED_SRC_PACKAGE/$(unsigned_src)/g" \ + -e "s/UNSIGNED_SRC_VERSION/$(unsigned_ver)/g" + rm -rf ./$(unsigned_ver) UNSIGNED SIGNED rm -f debian/linux-image-*.install \ debian/linux-image-*.preinst \ debian/linux-image-*.prerm \ @@ -35,11 +37,11 @@ clean:: pre-clean dh $@ override_dh_auto_build: - ./download-signed "linux-libc-dev" "$(src_version)" "$(src_package)" - #./download-unsigned "$(DEB_HOST_ARCH)" "$(src_version)" + ./download-signed "linux-libc-dev" "$(unsigned_ver)" "$(unsigned_package)" + #./download-unsigned "$(DEB_HOST_ARCH)" "$(unsigned_ver)" mkdir SIGNED ( \ - cd "$(src_version)" || exit 1; \ + cd "$(unsigned_ver)" || exit 1; \ for s in *.efi.signed; do \ [ ! -f "$$s" ] && continue; \ base=$$(echo "$$s" | sed -e 's/.efi.signed//'); \ @@ -64,10 +66,10 @@ override_dh_auto_build: override_dh_auto_install: for signed in "SIGNED"/*; do \ - flavour=$$(echo "$$signed" | sed -e "s@.*-$(src_abi)-@@"); \ + flavour=$$(echo "$$signed" | sed -e "s@.*-$(abi)-@@"); \ instfile=$$(echo "$$signed" | sed -e "s@[^/]*/@@" \ - -e "s@-$(src_abi)-.*@@"); \ - verflav="$(src_abi)-$$flavour"; \ + -e "s@-$(abi)-.*@@"); \ + verflav="$(abi)-$$flavour"; \ \ package="kernel-signed-image-$$verflav-di"; \ echo "$$package: adding $$signed"; \ @@ -77,19 +79,19 @@ override_dh_auto_install: echo "$$package: adding $$signed"; \ echo "$$signed boot" >>"debian/$$package.install"; \ \ - ./generate-depends linux-image-unsigned-$$verflav $(src_version) \ + ./generate-depends linux-image-unsigned-$$verflav $(unsigned_ver) \ linux-image-$$verflav \ >>"debian/linux-image-$$verflav.substvars"; \ \ for which in postinst postrm preinst prerm; do \ template="debian/templates/image.$$which.in"; \ script="debian/$$package.$$which"; \ - sed -e "s/@abiname@/$(src_abi)/g" \ + sed -e "s/@abiname@/$(abi)/g" \ -e "s/@localversion@/-$$flavour/g" \ -e "s/@image-stem@/$$instfile/g" \ <"$$template" >"$$script"; \ done; \ - echo "interest linux-update-$(src_abi)-$$flavour" \ + echo "interest linux-update-$(abi)-$$flavour" \ >"debian/$$package.triggers"; \ done dh_install @@ -98,8 +100,8 @@ override_dh_builddeb: dh_builddeb for pkg in $$(dh_listpackages); do \ case $$pkg in *dbgsym) ;; *) continue ;; esac; \ - mv ../$${pkg}_$(src_fullversion)_$(DEB_HOST_ARCH).deb \ - ../$${pkg}_$(src_fullversion)_$(DEB_HOST_ARCH).ddeb; \ + mv ../$${pkg}_$(ver)_$(DEB_HOST_ARCH).deb \ + ../$${pkg}_$(ver)_$(DEB_HOST_ARCH).ddeb; \ sed -i "/^$${pkg}_/s/\.deb /.ddeb /" debian/files; \ done