From 26fd2feb94db67e2b2abdeff233a3cd20fe0cbd9 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Tue, 3 Mar 2020 12:31:49 +0100 Subject: [PATCH] kernel/selinux-testsuite: fix module_load check The "conmakehash" program is not shipped on recent Fedora kernels (and who knows where else). Switch to "unifdef", which seems to be everywhere (and always an ELF executable). Signed-off-by: Ondrej Mosnacek --- kernel/selinux-testsuite/runtest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/selinux-testsuite/runtest.sh b/kernel/selinux-testsuite/runtest.sh index 730529e..bc843c8 100755 --- a/kernel/selinux-testsuite/runtest.sh +++ b/kernel/selinux-testsuite/runtest.sh @@ -354,7 +354,7 @@ rlJournalStart # CKI mainline kernels don't ship with module build infrastructure # just yet. Also, RHEL-8 CKI kernel-devel programs are # cross-compiled badly for alt arches, so try executing one of them. - if ! "/lib/modules/$(uname -r)/build/scripts/conmakehash" /dev/null &>/dev/null; then + if ! "/lib/modules/$(uname -r)/build/scripts/unifdef" /dev/null &>/dev/null; then exclude_tests+=" module_load" fi