From patchwork Fri Jun 17 15:00:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1644878 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=qTmlm6i8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4LPj0y48gkz9sGY for ; Sat, 18 Jun 2022 01:01:22 +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 1o2DTI-0006Lb-OQ; Fri, 17 Jun 2022 15:01:16 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1o2DTG-0006IM-C6 for kernel-team@lists.ubuntu.com; Fri, 17 Jun 2022 15:01:14 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 77F513F8D7 for ; Fri, 17 Jun 2022 15:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1655478071; bh=URZSV565t7m+f1RrmvzvQezyVPafb/WjhdQCfj3o4iI=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qTmlm6i8dxmXCgLzGaur0MmVoUQbYPejcOuuhFBKku4ujkzFIbHni6tz6evREsGB3 m3ucQjN0PLHDjykN9i2NE5o0eezl8THRd3bvI708IjhTaZ63iRQel5i6FWQk4qyvlJ oQUepkklv5wo3MslYGLWD2jIO8VVLsh/iK/oWVPXlNXh2tI6U0wCvW3DXlAUcnk3PB /mqUjI5F99z4BWR6O0nKoG0WUtrVs0BoSuglJYbAqN2UppmFSVVh172JAQ4ZjUv4VW CcqIAG/bIM2XDDGPJ+oeSdvMj1sLEOZ9IKOaFEEVv/2eOwlAs38ld5gjKgyHbNCqVx F49GNi+aXRBBg== Received: by mail-wm1-f72.google.com with SMTP id l17-20020a05600c4f1100b0039c860db521so2290801wmq.5 for ; Fri, 17 Jun 2022 08:01:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=URZSV565t7m+f1RrmvzvQezyVPafb/WjhdQCfj3o4iI=; b=zEdRT3qeYPrpyztm4jaBQYWnUwy0zi+ij2TTJCev5b9d2g5rLuRAyD2cNhBeKCEzuF /DPv/+mA+ERSpye7+NwLyFKcirQz1kkyzwShMZvcgfldohEBbGGwRtXauWAm65ovB/eQ AsVgagJc/48qlD6/3m2l2kQit7547zB/ezta19XmqU7SaZcoqS2jY0afUo3k3k+HFIbG todlzFAs+ulReqDMA4zx1oxzA9+DZ6LVscE881QLXePQOd6zuP2SqYSn7lVPLIzh1/8U Wd8hmI+GFo+J1EuFnsPDkIfsjHtZOQ9LFwXDT6+KQFK6UtzUPp7ZCTWVXRIZi7r8GoUa sDpA== X-Gm-Message-State: AJIora+L+idzfUjIMv0f6uryOII1bDoH61frroDlCZZtMvE2EqWRSrS7 mRG1wL8bZrI10g2IHqxAqKwX2/McCQqsQuJBID6kmipyhpFKYiYISpkywN60pdu3iMxBbbnE1cZ 0pfHdL/D4UQbWC9CLACkG3UjJrK/OQP/uUpWuEl7vVg== X-Received: by 2002:a05:6000:1707:b0:20f:dd3a:1c81 with SMTP id n7-20020a056000170700b0020fdd3a1c81mr9544268wrc.697.1655478070772; Fri, 17 Jun 2022 08:01:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tkW1J08xCGp8w5Ye6Rb1TNURopwsXHCfJw/gGHOki93zeqk5AlvCx3j0CP+Nf3xUPu1Cg5nw== X-Received: by 2002:a05:6000:1707:b0:20f:dd3a:1c81 with SMTP id n7-20020a056000170700b0020fdd3a1c81mr9544244wrc.697.1655478070497; Fri, 17 Jun 2022 08:01:10 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:9cce:a6ab:7f23:ac52]) by smtp.gmail.com with ESMTPSA id k7-20020a7bc407000000b0039c747a1e8fsm10604151wmi.7.2022.06.17.08.01.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 08:01:09 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [JAMMY][linux-hwe-5.17][PATCH 3/3] UBUNTU: [Packaging] Always catch errors in dkms-build scripts Date: Fri, 17 Jun 2022 16:00:56 +0100 Message-Id: <20220617150056.74671-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220617150056.74671-1-dimitri.ledkov@canonical.com> References: <20220617150056.74671-1-dimitri.ledkov@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" Enforce `set -e` execution of the dkms-build scripts, even when overall SHELL is not set to `bash -e`. This enforces that dkms-build scripts catch errors, even when building without SHELL variable, like it is done by the LRM packages. Signed-off-by: Dimitri John Ledkov Acked-by: Tim Gardner Signed-off-by: Paolo Pisati Signed-off-by: Dimitri John Ledkov --- debian/scripts/dkms-build | 4 ++-- debian/scripts/dkms-build--nvidia-N | 1 + debian/scripts/dkms-build-configure--zfs | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/scripts/dkms-build b/debian/scripts/dkms-build index d9b580c6a7..7763ccce7f 100755 --- a/debian/scripts/dkms-build +++ b/debian/scripts/dkms-build @@ -116,7 +116,7 @@ do continue fi echo "II: dkms-build-configure $(basename "$dkms_config") found, executing" - $SHELL "$dkms_config" \ + "$dkms_config" \ "$srcdir" \ "$dkms_conf" \ "$dkms_dir" \ @@ -243,7 +243,7 @@ do continue fi echo "II: dkms-build override $(basename "$dkms_build") found, executing" - $SHELL "$dkms_build" \ + "$dkms_build" \ "$srcdir" \ "$dkms_dir/build/$dkms_package/$dkms_version/objects" \ "$log" \ diff --git a/debian/scripts/dkms-build--nvidia-N b/debian/scripts/dkms-build--nvidia-N index 52711d2ac7..09ae382a1f 100755 --- a/debian/scripts/dkms-build--nvidia-N +++ b/debian/scripts/dkms-build--nvidia-N @@ -1,4 +1,5 @@ #!/bin/sh +set -e srcdir="$1" objects="$2" diff --git a/debian/scripts/dkms-build-configure--zfs b/debian/scripts/dkms-build-configure--zfs index 972c8604c8..09db28802e 100755 --- a/debian/scripts/dkms-build-configure--zfs +++ b/debian/scripts/dkms-build-configure--zfs @@ -1,4 +1,5 @@ #!/bin/sh +set -e srcdir="$1" dkms_conf="$2"