Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sysdig: patch 'main.c' to fix build for 6.10-kernel, 0.38.0 -> 0.38.1 #329418

Merged
merged 2 commits into from
Jul 25, 2024

Conversation

SebTM
Copy link
Contributor

@SebTM SebTM commented Jul 23, 2024

Description of changes

fixes #329233

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested a review from 7c6f434c July 23, 2024 14:42
@SebTM SebTM force-pushed the sysdig_kernel610 branch from ee3c5ed to 2cbb08f Compare July 23, 2024 15:24
@SebTM SebTM changed the title sysdig: patch 'main.c' to fix build for 6.10-kernel sysdig: patch 'main.c' to fix build for 6.10-kernel, 0.38.0 -> 0.38.1 Jul 23, 2024
@infinisil
Copy link
Member

The pkgs/by-name check failure was a problem on master, a rebase should fix it :)

@SebTM SebTM force-pushed the sysdig_kernel610 branch from 2cbb08f to 5947fd2 Compare July 24, 2024 15:23
@ofborg ofborg bot requested a review from 7c6f434c July 24, 2024 16:58
@7c6f434c 7c6f434c merged commit 094d29e into master Jul 25, 2024
25 of 26 checks passed
@eclairevoyant eclairevoyant deleted the sysdig_kernel610 branch July 25, 2024 12:03
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-329418-to-release-24.05 origin/release-24.05
cd .worktree/backport-329418-to-release-24.05
git switch --create backport-329418-to-release-24.05
git cherry-pick -x 58bae1819e47fd9cfc6955871e31766f32e31c39 5947fd237644a0413a555b3067f074e99e9260eb

@rhendric rhendric mentioned this pull request Aug 15, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: linuxPackages_6_10.sysdig
4 participants