From f301324a604dd21b495ee0da335698480a494c88 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Wed, 1 Jun 2022 12:19:13 +0200 Subject: [PATCH] driver-check.sh: avoid false positive error messages Fixes: bsc#1200107 --- driver-check.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/driver-check.sh b/driver-check.sh index c2622a3..2d29384 100644 --- a/driver-check.sh +++ b/driver-check.sh @@ -131,7 +131,7 @@ check_kernel_package() if ! rpm -q --qf '%{description}\n' "$kernel" | grep -q '^GIT '; then error "$kernel does not look like a SUSE kernel package (no commit id)" fi - if ! rpm -q --qf '%{postin}\n' "$kernel" | grep -q 'weak-modules2'; then + if ! rpm -q --qf '%{postin}\n' "$kernel" | egrep -Eq 'weak-modules2|kernel-scriptlets/rpm-post'; then error "$kernel does not look like a SUSE kernel package (wrong %post script)" fi } @@ -186,7 +186,7 @@ check_kmp() { local kmp=$1 prefix prev_krel krel path found_module=false - if ! rpm -q --qf '%{postin}\n' "$kmp" | grep -q 'weak-modules2'; then + if ! rpm -q --qf '%{postin}\n' "$kmp" | egrep -Eq 'weak-modules2|kernel-scriptlets/kmp-post'; then error "$kmp does not look like a SUSE kernel module package (wrong %post)" fi if ! rpm -q -R "$kmp" | grep -Eq "$req_re"; then @@ -321,7 +321,7 @@ for rpm in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' 'kernel-*' '*-kmp-*' | \ case "$rpm" in kernel-source-* | kernel-syms-* | kernel-*-debug* | kernel-*-man-* | \ kernel-*-devel-* | kernel-firmware-* | kernel-coverage-* | \ - kernel-docs-* | kernel-devel-* | kernel-macros-*) + kernel-docs-* | kernel-devel-* | kernel-macros-* | kernel-install-tools-*) continue esac # store the filelist to speed up file_owner()