From 5eb64632fd76bb7e26a90ab08c83132e7ac99e23 Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Wed, 17 Jan 2018 17:33:50 -0500 Subject: [PATCH] redhat: fix conditional for kernel-debuginfo files directive Commit 443dd5367e0cd9050ad39a6594c5be521271b4e9 added support for a separate debuginfo package for the kernel module. Unfortunately, the %files directive for the kernel module debuginfo package was incorrectly placed in the %if stanza of the build_userspace condition, so the rpmbuild fails when attempting to build just the kernel module. That is, when running rpmbuild with the options: rpmbuild --define "build_userspace 0" --define "build_modules 1" ... rpmbuild fails with: RPM build errors: Installed (but unpackaged) file(s) found: /usr/lib/debug/lib/modules/.../extra/openafs/openafs.ko.debug Fix this by moving the new %files directive out of the build_userspace conditional. Reviewed-on: https://gerrit.openafs.org/12874 Reviewed-by: Benjamin Kaduk Tested-by: Benjamin Kaduk (cherry picked from commit f599e1ce6354c42a9c0c8f7205ba8a03c35ea72b) Change-Id: I07e25d3dd43b2cd7056cefb8f0f5c10f78347b85 Reviewed-on: https://gerrit.openafs.org/12875 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/packaging/RedHat/openafs.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/RedHat/openafs.spec.in b/src/packaging/RedHat/openafs.spec.in index 62095051ee..eed497626c 100644 --- a/src/packaging/RedHat/openafs.spec.in +++ b/src/packaging/RedHat/openafs.spec.in @@ -1451,13 +1451,13 @@ dkms remove -m %{name} -v %{dkms_version} --rpm_safe_upgrade --all ||: %{_mandir}/man8/akeyconvert.8.gz %{_mandir}/man8/asetkey.8.gz %endif +%endif # build_userspace %if %{build_modules} %files -f kmod-debuginfo.list -n %{name}-kernel-debuginfo %defattr(-,root,root) %endif -%endif ############################################################################## ### ### openafs.spec change log