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

xone: added fix for kernel version 6.12 #347471

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Conversation

BeiNacht
Copy link
Contributor

@BeiNacht BeiNacht commented Oct 9, 2024

Fixes build on 6.12 kernel.

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.

@BeiNacht
Copy link
Contributor Author

BeiNacht commented Oct 9, 2024

Should i also open an issue for this patch? But when you are using linuxPackages_testing. Xone is not building.

       last 25 log lines:
       >   CC [M]  /build/source/auth/crypto.o
       >   CC [M]  /build/source/driver/common.o
       >   LD [M]  /build/source/xone-gip.o
       >   CC [M]  /build/source/driver/gamepad.o
       >   LD [M]  /build/source/xone-gip-gamepad.o
       >   CC [M]  /build/source/driver/headset.o
       > /build/source/driver/headset.c: In function 'gip_headset_pcm_hw_params':
       > /build/source/driver/headset.c:93:16: error: implicit declaration of function 'snd_pcm_lib_alloc_vmalloc_buffer' [-Werror=implicit-function-declaration]
       >    93 |         return snd_pcm_lib_alloc_vmalloc_buffer(sub,
       >       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       > /build/source/driver/headset.c: In function 'gip_headset_pcm_hw_free':
       > /build/source/driver/headset.c:99:16: error: implicit declaration of function 'snd_pcm_lib_free_vmalloc_buffer'; did you mean 'snd_pcm_lib_malloc_pages'? [-Werror=implicit-function-declaration]
       >    99 |         return snd_pcm_lib_free_vmalloc_buffer(sub);
       >       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       >       |                snd_pcm_lib_malloc_pages
       > /build/source/driver/headset.c: At top level:
       > /build/source/driver/headset.c:160:17: error: 'snd_pcm_lib_get_vmalloc_page' undeclared here (not in a function); did you mean 'snd_pcm_lib_malloc_pages'?
       >   160 |         .page = snd_pcm_lib_get_vmalloc_page,
       >       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
       >       |                 snd_pcm_lib_malloc_pages
       > cc1: some warnings being treated as errors
       > make[2]: *** [/nix/store/x2dfzvn5skf5d4yphlbzvravzg6r53ly-linux-6.12-rc1-dev/lib/modules/6.12.0-rc1/source/scripts/Makefile.build:229: /build/source/driver/headset.o] Error 1
       > make[1]: *** [/nix/store/x2dfzvn5skf5d4yphlbzvravzg6r53ly-linux-6.12-rc1-dev/lib/modules/6.12.0-rc1/source/Makefile:1936: /build/source] Error 2
       > make: *** [/nix/store/x2dfzvn5skf5d4yphlbzvravzg6r53ly-linux-6.12-rc1-dev/lib/modules/6.12.0-rc1/source/Makefile:224: __sub-make] Error 2
       > make: Leaving directory '/nix/store/x2dfzvn5skf5d4yphlbzvravzg6r53ly-linux-6.12-rc1-dev/lib/modules/6.12.0-rc1/build'
       For full logs, run 'nix log /nix/store/bifx0a9m19zsxrb5bj8yv5mfflnf6jla-xone-0.3-unstable-2024-03-16.drv'.
error: 1 dependencies of derivation '/nix/store/qfy59p4ip2pck93pk9p931jr7wx11slz-linux-6.12-rc1-modules.drv' failed to build
error: 1 dependencies of derivation '/nix/store/hb46z8360abay781axpwzy47w388mbna-nixos-system-desktop-24.11.20241006.c31898a.drv' failed to build

@ofborg ofborg bot requested a review from rhysmdnz October 9, 2024 13:14
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Oct 9, 2024
@Scrumplex
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 347471


x86_64-linux

⏩ 3 packages marked as broken and skipped:
  • linuxKernel.packages.linux_5_4_hardened.xone
  • linuxKernel.packages.linux_6_10.xone
  • linuxPackages_5_4_hardened.xone
❌ 3 packages failed to build:
  • linuxKernel.packages.linux_5_10.xone
  • linuxPackages_5_10_hardened.xone (linuxKernel.packages.linux_5_10_hardened.xone)
  • linuxKernel.packages.linux_5_4.xone
✅ 13 packages built:
  • linuxKernel.packages.linux_5_15.xone
  • linuxPackages_5_15_hardened.xone (linuxKernel.packages.linux_5_15_hardened.xone)
  • linuxKernel.packages.linux_6_1.xone
  • linuxPackages_latest.xone (linuxKernel.packages.linux_6_11.xone)
  • linuxPackages_6_1_hardened.xone (linuxKernel.packages.linux_6_1_hardened.xone)
  • linuxPackages.xone (linuxKernel.packages.linux_6_6.xone)
  • linuxPackages_hardened.xone (linuxPackages_6_6_hardened.xone)
  • linuxPackages_latest-libre.xone (linuxKernel.packages.linux_latest_libre.xone)
  • linuxPackages-libre.xone (linuxKernel.packages.linux_libre.xone)
  • linuxPackages_lqx.xone (linuxKernel.packages.linux_lqx.xone)
  • linuxPackages_xanmod.xone (linuxKernel.packages.linux_xanmod.xone)
  • linuxPackages_xanmod_latest.xone (linuxKernel.packages.linux_xanmod_latest.xone ,linuxPackages_xanmod_stable.xone)
  • linuxPackages_zen.xone (linuxKernel.packages.linux_zen.xone)

@Scrumplex
Copy link
Member

But when you are using linuxPackages_testing. Xone is not building.

It's building fine for me :O

I think we might need a conditional to let older kernels build with this. Lemme see if I can get it working

@Scrumplex
Copy link
Member

It seems like 5.x is currently failing to build on master too.

Just having conditionals for the patches isn't enough it seems.

This should be good to be merged for now

@Scrumplex Scrumplex added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 31, 2024
@Scrumplex Scrumplex merged commit 4bf1468 into NixOS:master Oct 31, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants