Skip to content

Commit a37dff4

Browse files
committed
Merge: kernel.spec: add missing tools-libs on s390x
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/427 JIRA: https://issues.redhat.com/browse/RHEL-80626 Upstream Status: ARK commit bc86c1c47085637adec8627f507a9130211f5178 commit bc86c1c47085637adec8627f507a9130211f5178 Author: Jan Stancek <jstancek@redhat.com> Date: Tue Feb 25 03:59:52 2025 -0500 kernel.spec: add missing tools-libs on s390x tools-libs-devel requires tools-libs. Previously on s390x they would be both skipped by %cpupowerarches check. But after adding ynl headers and library to tools-libs-devel, it is now built also on s390x. But tools-libs is still skipped and creates a missing dependency. We could conditionally skip the Requires on s390x, but that adds extra burden to keep such condition up to date as more artefacts get introduced to tools-libs-devel in future. Simplest is to just create tools-libs on s390x, even if it ends up empty for now. Fixes: e9f967afa161 ("redhat: kernel.spec: add ynl to kernel-tools") Reported-by: Bruno Goncalves <bgoncalv@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com> Approved-by: Daniel Horak <dhorak@redhat.com> Approved-by: Scott Weaver <scweaver@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents 065b983 + c8e5747 commit a37dff4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

redhat/kernel.spec.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4078,8 +4078,8 @@ fi\
40784078
%files -f %{package_name}-tools-debuginfo.list -n %{package_name}-tools-debuginfo
40794079
%endif
40804080

4081-
%ifarch %{cpupowerarchs}
40824081
%files -n %{package_name}-tools-libs
4082+
%ifarch %{cpupowerarchs}
40834083
%{_libdir}/libcpupower.so.1
40844084
%{_libdir}/libcpupower.so.0.0.1
40854085
%endif

0 commit comments

Comments
 (0)