Skip to content

linuxPackages_latest.perf: apply upstream patch for binutils-2.39#186318

Merged
trofi merged 1 commit intoNixOS:masterfrom
trofi:latest-perf-for-binutils-2.39
Aug 14, 2022
Merged

linuxPackages_latest.perf: apply upstream patch for binutils-2.39#186318
trofi merged 1 commit intoNixOS:masterfrom
trofi:latest-perf-for-binutils-2.39

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Aug 12, 2022 •
edited
Loading

Without the change build fails as:

perf-linux> util/annotate.c: In function 'symbol__disassemble_bpf':
perf-linux> util/annotate.c:1765:9: error: too few arguments to function 'init_disassemble_info'
perf-linux>  1765 |         init_disassemble_info(&info, s,
perf-linux>       |         ^~~~~~~~~~~~~~~~~~~~~
Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@trofi
linuxPackages_latest.perf: apply upstream patch for binutils-2.39
ca07cc0 
Without the change build fails as:

    perf-linux> util/annotate.c: In function 'symbol__disassemble_bpf':
    perf-linux> util/annotate.c:1765:9: error: too few arguments to function 'init_disassemble_info'
    perf-linux>  1765 |         init_disassemble_info(&info, s,
    perf-linux>       |         ^~~~~~~~~~~~~~~~~~~~~
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Aug 12, 2022
@trofi trofi mentioned this pull request Aug 12, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from viric August 12, 2022 17:42
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 12, 2022
@trofi trofi merged commit 7c69856 into NixOS:master Aug 14, 2022
@trofi trofi deleted the latest-perf-for-binutils-2.39 branch August 14, 2022 07:59
ghost
ghost reviewed Aug 16, 2022
View reviewed changes
pkgs/os-specific/linux/kernel/perf.nix
@@ -15,6 +15,13 @@ stdenv.mkDerivation {

inherit (kernel) src;

Copy link

@ghost ghost Aug 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
assert !(versionAtLeast kernel.version "5.19") -> throw "perf with binutils >= 2.39 requires kernel >= 5.19";

Copy link
Contributor Author

@trofi trofi Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this assert. It does not mention binutils version in the constraints. Where does that requirement come from?

Also note that master branch does not yet have binutils-2.39.

Copy link

@ghost ghost Aug 17, 2022 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this assert. It does not mention binutils version in the constraints. Where does that requirement come from?

I suggested in #185297, which bumps the binutils version to 2.39, that you include this change in that PR.

Github won't let me put the ```suggest in that PR. Apparently I can only ```suggest changes within three lines of something the PR already touches. So I have to do it here and mention it over there.

Copy link
Contributor Author

@trofi trofi Aug 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, that makes sense.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@viric viric Awaiting requested review from viric

1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@trofi