[J/linux][J/linux-unstable][PATCH 3/3] UBUNTU: [Packaging] Always catch errors in dkms-build scripts
Dimitri John Ledkov
dimitri.ledkov at canonical.com
Fri Mar 11 16:07:09 UTC 2022
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 <dimitri.ledkov at canonical.com>
---
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"
--
2.32.0
More information about the kernel-team
mailing list