From patchwork Tue Apr 3 16:52:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 894707 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]) by ozlabs.org (Postfix) with ESMTP id 40FwBg6GkSz9s3M; Wed, 4 Apr 2018 02:52: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 1f3PB1-0005lb-Tj; Tue, 03 Apr 2018 16:52: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 1f3PAz-0005iD-IQ for kernel-team@lists.ubuntu.com; Tue, 03 Apr 2018 16:52:53 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1f3PAz-0004Dv-9r; Tue, 03 Apr 2018 16:52:53 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [xenial/master-next 1/2] UBUNTU: [Packaging] final-checks -- remove check for empty retpoline files Date: Tue, 3 Apr 2018 17:52:48 +0100 Message-Id: <20180403165249.15489-9-apw@canonical.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180403165249.15489-1-apw@canonical.com> References: <20180403165249.15489-1-apw@canonical.com> 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: , Cc: Andy Whitcroft MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Seth Forshee With the new support for removing known safe retpoline sequences from the ones which were detected it is now completely valid to end up with an empty retpoline file in the abi. Remove the check for empty retpoline files so this will not cause an error. BugLink: http://bugs.launchpad.net/bugs/1758856 Signed-off-by: Seth Forshee Signed-off-by: Andy Whitcroft Acked-by: Juerg Haefliger Acked-by: Stefan Bader --- debian/scripts/misc/final-checks | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks index aec25770ea1b..548dea99e6a0 100755 --- a/debian/scripts/misc/final-checks +++ b/debian/scripts/misc/final-checks @@ -41,11 +41,6 @@ abi_check() then failure "$arch/$flavour ABI retpoline file missing" fi - - if [ -f "$abidir/$flavour.retpoline" -a \ - ! -s "$abidir/$flavour.retpoline" ]; then - failure "$arch/$flavour ABI retpoline file empty -- must regenerate or ignore" - fi } for arch in $archs