Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 937403 - dev-util/bpftool: fail to apply any update patches
Summary: dev-util/bpftool: fail to apply any update patches
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Holger Hoffstätte
URL:
Whiteboard:
Keywords: PullRequest
Depends on:
Blocks: 937402
  Show dependency tree
 
Reported: 2024-08-05 18:27 UTC by Holger Hoffstätte
Modified: 2024-08-06 10:16 UTC (History)
2 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Holger Hoffstätte 2024-08-05 18:27:54 UTC
While fixing #937402 I discovered that neither bpftool nor perf actaully apply any of incremental patches on top of the base kernel tree. This is because the list of directories passed to filterdiff does not contain correct expressions (directories need a trailing /*) and therefore the applied patch file is empty.


Reproducible: Always

Steps to Reproduce:
1. bump bpftool-7.5.0 to use kernel 6.10.3 instead of 6.10
2. emerge claims the patch-6.10.3 was applied
3. inspecting the code shows that this is incorrect since the applied patch file in $WORKDIR is 0 bytes.



Both bpftool and perf need the same fix.
Comment 1 Holger Hoffstätte 2024-08-05 19:07:02 UTC
The problem is compounded by the fact that filterdiff is used with -z (compressed input, gz/bz2), but cannot actually filter directly from xz archives and successfuly fails with exit code 0.
Comment 2 Mike Gilbert gentoo-dev 2024-08-05 20:25:23 UTC
Please file a separate bug for dev-util/perf; it is maintained by different people.
Comment 3 Holger Hoffstätte 2024-08-05 20:38:01 UTC
(In reply to Mike Gilbert from comment #2)
> Please file a separate bug for dev-util/perf; it is maintained by different
> people.

PR updated.
Comment 4 Larry the Git Cow gentoo-dev 2024-08-06 10:16:54 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f0a37b4e11c414c39c18a7fbc53e7a0e9503ce2

commit 0f0a37b4e11c414c39c18a7fbc53e7a0e9503ce2
Author:     Holger Hoffstätte <holger@applied-asynchrony.com>
AuthorDate: 2024-08-05 18:49:36 +0000
Commit:     Guilherme Amadio <amadio@gentoo.org>
CommitDate: 2024-08-06 10:15:43 +0000

    dev-util/bpftool: fix miscompilation with clang & correctly apply patches
    
    Closes: https://bugs.gentoo.org/937402
    Closes: https://bugs.gentoo.org/937403
    
    Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
    Signed-off-by: Guilherme Amadio <amadio@gentoo.org>

 dev-util/bpftool/bpftool-7.5.0-r1.ebuild | 127 +++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)