diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:40:22 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 17:44:43 +0000 |
commit | b5b67adcc17e3e74dbcda09ff3f8a4636aa53486 (patch) | |
tree | 601c346183757b42c53b1d0aa8773cb00d1bd73c /debian/tests/headers-kbuild | |
parent | Merging upstream version 6.7.7. (diff) | |
download | linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.tar.xz linux-b5b67adcc17e3e74dbcda09ff3f8a4636aa53486.zip |
Merging debian version 6.7.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--] | debian/tests/headers-kbuild (renamed from debian/tests/kbuild) | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/debian/tests/kbuild b/debian/tests/headers-kbuild index 18cbe214e8..55681de015 100644..100755 --- a/debian/tests/kbuild +++ b/debian/tests/headers-kbuild @@ -1,5 +1,7 @@ #!/bin/sh -eu +KERNEL_RELEASE="$1" + mkdir "$AUTOPKGTEST_TMP"/foo cat >"$AUTOPKGTEST_TMP"/foo/foo.c <<EOF #include <linux/kernel.h> @@ -23,21 +25,7 @@ cat >"$AUTOPKGTEST_TMP"/foo/Kbuild <<EOF obj-m += foo.o EOF -arch="$(dpkg --print-architecture)" -abiname="$(debian/bin/getconfig.py version abiname)" -if flavour="$(debian/bin/getconfig.py base $arch none quick-flavour)"; then - echo "I: Found quick flavour $flavour" -elif flavour="$(debian/bin/getconfig.py base $arch none default-flavour)"; then - echo "I: Found default flavour $flavour" -elif flavour="$(debian/bin/getconfig.py base $arch default-flavour)"; then - echo "I: Found default flavour $flavour" -else - echo >&2 "E: Failed to find quick or default flavour" - exit 1 -fi -release="$abiname-$flavour" - -echo "I: Build for $release" +echo "I: Build for $KERNEL_RELEASE" # There are some warnings sent to stderr that we need to suppress, # but any other output to stderr should be treated as a failure. # We also want all stdout/stderr to appear in order in the log. @@ -45,7 +33,7 @@ echo "I: Build for $release" exec 3>&1 # Next, run the build with stdout sent to the original stdout and # stderr sent through tee to both the original stdout and a file -make -C /lib/modules/"$release"/build M="$AUTOPKGTEST_TMP"/foo V=1 \ +make -C /lib/modules/"$KERNEL_RELEASE"/build M="$AUTOPKGTEST_TMP"/foo V=1 \ 2>&1 1>&3 | tee "$AUTOPKGTEST_TMP"/foo/make.stderr # Close fd 3 exec 3>&- @@ -55,4 +43,4 @@ if grep -q -v -E 'Skipping BTF generation .* due to unavailability of vmlinux' " fi echo "I: Clean" -make -C /lib/modules/"$release"/build M="$AUTOPKGTEST_TMP"/foo V=1 clean +make -C /lib/modules/"$KERNEL_RELEASE"/build M="$AUTOPKGTEST_TMP"/foo V=1 clean |