From 076b73e06df8240f209470ea6ee19b66eb4166c3 Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Thu, 26 Apr 2018 19:33:31 +0200 Subject: [PATCH] redhat: Make separate debuginfo for kmods work with recent rpm Commit 443dd5367e0cd9050ad39a6594c5be521271b4e9 introduced the creation of separate debuginfo packages for kmod packages, and commmit 387ae9536888419d7b101513e04e1c644e3218d6 moved the code from the spec into the kmodtool script. Recent versions of rpm (the issue was found on Fedora 27) extract the debuginfo data from a copy of the original files having the package version-release as a suffix. This broke the original change since the regular expression passed to find-debuginfo.sh no longer matched the name of the openafs.ko file. The file list for the -debuginfo package remained empty, which caused rpmbuild to fail. Relax the regex to match the previous and current file names we are after. It is possible but unlikely that .*openafs\.ko.* will ever match any file not being a kernel module. Change-Id: I57178ed2c593551ede6f4ab2679dd0360dc362cf Reviewed-on: https://gerrit.openafs.org/13030 Tested-by: BuildBot Reviewed-by: Michael Meffie Tested-by: Michael Meffie Reviewed-by: Benjamin Kaduk --- src/packaging/RedHat/openafs-kmodtool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/RedHat/openafs-kmodtool b/src/packaging/RedHat/openafs-kmodtool index 6721b79..eea4ed4 100644 --- a/src/packaging/RedHat/openafs-kmodtool +++ b/src/packaging/RedHat/openafs-kmodtool @@ -93,7 +93,7 @@ get_rpmtemplate () cat <