From patchwork Fri Jan 25 17:57: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: 1031234 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 43mRZR2tnyz9sBn; Sat, 26 Jan 2019 04:57:51 +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 1gn5je-0000kA-8f; Fri, 25 Jan 2019 17:57:46 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1gn5jU-0000dZ-M2 for kernel-team@lists.ubuntu.com; Fri, 25 Jan 2019 17:57:36 +0000 Received: from localhost (c-107-2-141-103.hsd1.co.comcast.net [107.2.141.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 74BDE33E0093; Fri, 25 Jan 2019 10:57:34 -0700 (MST) From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 1/3][disco linux] UBUNTU: [Packaging] remove handoff check for uefi signing Date: Fri, 25 Jan 2019 10:57:21 -0700 Message-Id: <20190125175725.6696-2-dann.frazier@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190125175725.6696-1-dann.frazier@canonical.com> References: <20190125175725.6696-1-dann.frazier@canonical.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.100.2 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.0 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on complete.lackof.org 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" From: Seth Forshee This check doesn't work for arm64 and is no longer necessary for x86, so remove it. Signed-off-by: Seth Forshee Signed-off-by: dann frazier --- debian/rules.d/2-binary-arch.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 08c2813f96571..61805f69e3fcd 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -120,13 +120,8 @@ endif ifeq ($(uefi_signed),true) install -d $(signingv) - # Check to see if this supports handoff, if not do not sign it. - # Check the identification area magic and version >= 0x020b - handoff=`dd if="$(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$*" bs=1 skip=514 count=6 2>/dev/null | od -s | gawk '($$1 == 0 && $$2 == 25672 && $$3 == 21362 && $$4 >= 523) { print "GOOD" }'`; \ - if [ "$$handoff" = "GOOD" ]; then \ - cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ - $(signingv)/$(instfile)-$(abi_release)-$*.efi; \ - fi + cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ + $(signingv)/$(instfile)-$(abi_release)-$*.efi; endif ifeq ($(opal_signed),true) install -d $(signingv)