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

batman-adv: 2024.3 -> 2024.4 #363940

Merged
merged 1 commit into from
Dec 11, 2024
Merged

batman-adv: 2024.3 -> 2024.4 #363940

merged 1 commit into from
Dec 11, 2024

Conversation

herbetom
Copy link
Member

  • batman-adv
    • support latest kernels (5.4 - 6.13)
    • coding style cleanups and refactoring
    • bugs squashed:
      • prevent transmission of uninitialized memory for TT TVLVs
      • avoid stuck, overfull translation table changes list
  • batctl
    • coding style cleanups and refactoring
    • drop explicit requirement to run as root

Changelog: https://www.open-mesh.org/news/119

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@herbetom herbetom added 8.has: package (update) This PR updates a package to a newer version backport release-24.11 Backport PR automatically labels Dec 10, 2024
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Dec 10, 2024
@herbetom
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 363940


x86_64-linux

⏩ 1 package marked as broken and skipped:
  • linuxKernel.packages.linux_5_4_hardened.batman_adv
❌ 4 packages failed to build:
  • linuxKernel.packages.linux_6_12.batman_adv
  • linuxKernel.packages.linux_latest_libre.batman_adv
  • linuxKernel.packages.linux_libre.batman_adv
  • linuxKernel.packages.linux_lqx.batman_adv
✅ 16 packages built:
  • alfred
  • batctl
  • linuxKernel.packages.linux_5_10.batman_adv
  • linuxKernel.packages.linux_5_10_hardened.batman_adv
  • linuxKernel.packages.linux_5_15.batman_adv
  • linuxKernel.packages.linux_5_15_hardened.batman_adv
  • linuxKernel.packages.linux_5_4.batman_adv
  • linuxKernel.packages.linux_6_1.batman_adv
  • linuxKernel.packages.linux_6_11.batman_adv
  • linuxKernel.packages.linux_6_11_hardened.batman_adv
  • linuxKernel.packages.linux_6_1_hardened.batman_adv
  • linuxKernel.packages.linux_6_6.batman_adv
  • linuxKernel.packages.linux_hardened.batman_adv (linuxKernel.packages.linux_6_6_hardened.batman_adv)
  • linuxKernel.packages.linux_xanmod.batman_adv
  • linuxKernel.packages.linux_xanmod_latest.batman_adv (linuxKernel.packages.linux_xanmod_stable.batman_adv)
  • linuxKernel.packages.linux_zen.batman_adv

aarch64-linux

⏩ 6 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_4_hardened.batman_adv
  • linuxKernel.packages.linux_lqx.batman_adv
  • linuxKernel.packages.linux_xanmod.batman_adv
  • linuxKernel.packages.linux_xanmod_latest.batman_adv
  • linuxKernel.packages.linux_xanmod_stable.batman_adv
  • linuxKernel.packages.linux_zen.batman_adv
❌ 3 packages failed to build:
  • linuxKernel.packages.linux_6_12.batman_adv
  • linuxKernel.packages.linux_latest_libre.batman_adv
  • linuxKernel.packages.linux_libre.batman_adv
✅ 13 packages built:
  • alfred
  • batctl
  • linuxKernel.packages.linux_5_10.batman_adv
  • linuxKernel.packages.linux_5_10_hardened.batman_adv
  • linuxKernel.packages.linux_5_15.batman_adv
  • linuxKernel.packages.linux_5_15_hardened.batman_adv
  • linuxKernel.packages.linux_5_4.batman_adv
  • linuxKernel.packages.linux_6_1.batman_adv
  • linuxKernel.packages.linux_6_11.batman_adv
  • linuxKernel.packages.linux_6_11_hardened.batman_adv
  • linuxKernel.packages.linux_6_1_hardened.batman_adv
  • linuxKernel.packages.linux_6_6.batman_adv
  • linuxKernel.packages.linux_hardened.batman_adv (linuxKernel.packages.linux_6_6_hardened.batman_adv)

@philiptaron
Copy link
Contributor

I wonder what the delta is with upstream and us such that they support 6.12 and 6.13 and we find ourselves with a build failure.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 10, 2024
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

The kernel module builds fine for me on 6.12 (latest) and the libre variants.

@fpletz fpletz merged commit 53261ae into NixOS:master Dec 11, 2024
36 checks passed
@nix-backports
Copy link

nix-backports bot commented Dec 11, 2024

Successfully created backport PR for release-24.11:

@herbetom herbetom deleted the update-batman-adv branch December 11, 2024 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants