Bug 2337459 - kernel package builds fail since bin/sbin merge
Summary: kernel package builds fail since bin/sbin merge
Keywords:
Status: CLOSED RAWHIDE
Alias: None
Product: Fedora
Classification: Fedora
Component: kernel
Version: rawhide
Hardware: All
OS: Linux
unspecified
high
Target Milestone: ---
Assignee: Kernel Maintainer List
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks: 2267022
TreeView+ depends on / blocked
 
Reported: 2025-01-13 22:24 UTC by Adam Williamson
Modified: 2025-01-15 10:48 UTC (History)
16 users (show)

Fixed In Version: kernel-6.13.0-0.rc7.20250114gitc45323b7560e.56.fc42
Clone Of:
Environment:
Last Closed: 2025-01-15 10:48:20 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)

Description Adam Williamson 2025-01-13 22:24:12 UTC
Now https://bodhi.fedoraproject.org/updates/FEDORA-2025-da0a082e66 went through, kernel package builds fail, because intel_sdsi is still installed to /usr/sbin , but rpm %_sbindir is now defined as /usr/bin .

We either need to change the package list entry to something like %_usr/sbin/intel_sdsi , or - more in spirit with the change - make sure intel_sdsi actually gets installed in /usr/bin not /usr/sbin .

Comment 1 Adam Williamson 2025-01-13 22:26:10 UTC
The most recent official build succeeded as it was before the sbin merge landed, but I hit this doing a scratch build of it with an unrelated patch. It failed with:

error: File not found: /builddir/build/BUILD/kernel-6.13.0-build/BUILDROOT/usr/bin/intel_sdsi

See https://koji.fedoraproject.org/koji/taskinfo?taskID=127839252 .

Comment 2 Adam Williamson 2025-01-13 22:27:55 UTC
This should probably fix it (testing now):

@@ -3390,7 +3392,7 @@ chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
    %{tools_make} DESTDIR=%{buildroot} install
    popd
    pushd tools/arch/x86/intel_sdsi
-   %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} install
+   %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} BINDIR=/usr/bin install
    popd
 %endif
 pushd tools/thermal/tmon

Comment 3 Adam Williamson 2025-01-13 22:28:43 UTC
or, I guess:

@@ -3390,7 +3392,7 @@ chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
    %{tools_make} DESTDIR=%{buildroot} install
    popd
    pushd tools/arch/x86/intel_sdsi
-   %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} install
+   %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} BINDIR=%{_sbindir} install
    popd
 %endif
 pushd tools/thermal/tmon

Comment 4 Zbigniew Jędrzejewski-Szmek 2025-01-14 08:09:26 UTC
Thanks. That looks reasonable. Did this get submitted?

Comment 5 Zbigniew Jędrzejewski-Szmek 2025-01-14 08:23:46 UTC
I don't see a pr anywhere.
Submitted as https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3595.

Comment 6 Adam Williamson 2025-01-14 08:25:33 UTC
Well you could've waited more than 14 minutes :( I was trying to submit it, but the kernel package has PRs disabled. I had no idea that's where PRs are meant to go. Is it documented somewhere?

Comment 7 Adam Williamson 2025-01-14 08:26:15 UTC
ah, ok, if you follow enough breadcrumbs from the src.fp.o repo you eventually wind up at kernel-ark. I guess that's fine.

Comment 8 Zbigniew Jędrzejewski-Szmek 2025-01-14 08:39:06 UTC
Oh, I thought that you're probably asleep at this time ;)
I was counting 10h from the last comment.

Comment 9 Zbigniew Jędrzejewski-Szmek 2025-01-15 10:48:20 UTC
kernel-6.13.0-0.rc7.20250114gitc45323b7560e.56.fc42 built successfully yesterday.


Note You need to log in before you can comment on or make changes to this bug.