From patchwork Wed Feb 10 17:58:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 1439176 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 4DbSF20SpCz9sRf; Thu, 11 Feb 2021 04:59:00 +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 1l9tlM-0002U1-Lk; Wed, 10 Feb 2021 17:58:52 +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 1l9tlL-0002Tt-3o for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2021 17:58:51 +0000 Received: from 2.general.kamal.us.vpn ([10.172.68.52] helo=ascalon) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l9tlK-0003TL-Ji for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2021 17:58:50 +0000 Received: from kamal by ascalon with local (Exim 4.90_1) (envelope-from ) id 1l9tlH-0007dk-60 for kernel-team@lists.ubuntu.com; Wed, 10 Feb 2021 09:58:47 -0800 From: Kamal Mostafa To: kernel-team@lists.ubuntu.com Subject: [SRU][PATCH v2][X, B] UBUNTU: [Packaging] dkms-build: fix wireguard build logging Date: Wed, 10 Feb 2021 09:58:43 -0800 Message-Id: <20210210175843.29207-1-kamal@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210209233320.27291-1-kamal@canonical.com> References: <20210209233320.27291-1-kamal@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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" The dkms-build script (<=bionic) fails to find and display the dkms build log for some dkms component(s), e.g. wireguard. Add the missing path and logic matching >=focal's version of the script. Ignore: yes Signed-off-by: Kamal Mostafa Acked-by: Stefan Bader Acked-by: Tim Gardner --- [v2] Added "[Packaging]" and ACK's. debian/scripts/dkms-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build index 55d09d920746..5e5cef9bd3ec 100755 --- a/debian/scripts/dkms-build +++ b/debian/scripts/dkms-build @@ -141,9 +141,9 @@ rc=0 "$dkms_conf" || rc=1 # Find the log and add it to our own. -for log in "$dkms_dir/build/$dkms_package/$dkms_version/$abi_flavour"/*/"log/make.log" +for log in "$dkms_dir/build/$dkms_package/$dkms_version/$abi_flavour"/*/"log/make.log" "$dkms_dir/build/$dkms_package/$dkms_version/build/make.log" do - break + [ -f "$log" ] && break done sed -e "s@$dkms_dir@<>@g" <"$log"