Skip to content

Commit

Permalink
driver-check.sh: avoid false positive error messages
Browse files Browse the repository at this point in the history
Fixes: bsc#1200107
  • Loading branch information
mwilck committed Jun 1, 2022
1 parent eb6380d commit f301324
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions driver-check.sh
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit f301324

Please sign in to comment.