From patchwork Tue Mar 16 12:26:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 1453862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) 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 4F0CFh4Y88z9sWV; Tue, 16 Mar 2021 23:26:32 +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 1lM8mL-0007eJ-Qi; Tue, 16 Mar 2021 12:26:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lM8mI-0007d1-HB for kernel-team@lists.ubuntu.com; Tue, 16 Mar 2021 12:26:26 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lM8mI-0004Zw-8G for kernel-team@lists.ubuntu.com; Tue, 16 Mar 2021 12:26:26 +0000 Received: by mail-ed1-f70.google.com with SMTP id r19so17099183edv.3 for ; Tue, 16 Mar 2021 05:26:26 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CWhNXM6Hj2h0a2BewTfiEkqk5j5LFYZsnfxMyuLPvys=; b=gKxS5BP+V24iqvWJw0fPxxE9uxmMUe45XYpG9vR/Pfz4yse98QdSZGx4FFuca0WSNC aUdVsu2Or8jS7eAuVpCGvyLrxIY+pba7MlD66rDe2wk6c3ZuFakzEDUYmSzP3hSuIXpd Yx50L2J3ng6jQtxDi9UFMZbf86cXHSRSKeQgwMkGFDcBtQGsH8ftQD8mB2uZeym1LOXF Tg6dA43/VJOMP65iYhAWMBgHf81aJVxM8ESef9Wg+tEg68P2iZnElq4bROQV3N93xoVw gbH2ZfOO7zQs9s8O/jRAeLxVqDnnT8RNo4UwIAV03JUIc6E6//wcuMQShFHyBJ1dnz9m hD7g== X-Gm-Message-State: AOAM533lYLomjYHtLdJF+iJboIPWEnlnXQMoogBMJvjaFF6+xEuATd8S Gv3UuGFD/T0D4yd4dVMOVTpDOiHr5uOk8qerQ4Zpr3IHk1dNK2yliF+U8CFDG69IwzUKCV+a3oa RddFDO8T7rPVioyeJF5Fp/v+tGjgWam/KVK1A6MWIDA== X-Received: by 2002:a17:907:94c3:: with SMTP id dn3mr29541046ejc.280.1615897585671; Tue, 16 Mar 2021 05:26:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwHhqiXLIznmYYCDzEfP3S6yaoN9lJONVTFXeAIWdSYsoRKTLBBdTITKZ46qy7ESLAnvNNDVA== X-Received: by 2002:a17:907:94c3:: with SMTP id dn3mr29541029ejc.280.1615897585482; Tue, 16 Mar 2021 05:26:25 -0700 (PDT) Received: from localhost ([2001:470:6973:2:b9e:66f2:fb2:340d]) by smtp.gmail.com with ESMTPSA id b21sm9089938ejv.13.2021.03.16.05.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 05:26:25 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [SRU B/F/G LRM] [PATCH 1/1] UBUNTU: [Packaging] quiet (nomially) benign errors in BUILD script Date: Tue, 16 Mar 2021 12:26:22 +0000 Message-Id: <20210316122622.3167798-2-apw@canonical.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210316122622.3167798-1-apw@canonical.com> References: <20210316122622.3167798-1-apw@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: , Cc: Andy Whitcroft Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Though the assembly errors we see in the linux-restricted-modules builds themselves are benign (the .ko checksums are validated) the same erroneous commands are not (always) benign in the final end-user installations. Eliminate these extra commands in the final end-user BUILD script. BugLink: https://bugs.launchpad.net/bugs/1919315 Signed-off-by: Andy Whitcroft --- debian/scripts/dkms-build--nvidia-N | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/scripts/dkms-build--nvidia-N b/debian/scripts/dkms-build--nvidia-N index bdec782..210bf1a 100755 --- a/debian/scripts/dkms-build--nvidia-N +++ b/debian/scripts/dkms-build--nvidia-N @@ -80,6 +80,9 @@ grep /usr/bin/ld.bfd "$log" | sed -e "s@$build/@@g" \ cp "$base/signatures/$package/"*".ko.sig" "$pkgdir/bits" sha256sum -c "$base/signatures/$package/SHA256SUMS" || exit 1 sh ./CLEAN + + sed -i '/objdump/d' ./BUILD + else # We are in the main kernel, put the .kos together as we will # on the users machine, sign them, and keep just the signature.