Skip to content

Fix building on Linux 6.15#364

Merged
tomaspinho merged 2 commits intotomaspinho:masterfrom
Prince213:push-orqplqmxtkux
May 31, 2025
Merged

Fix building on Linux 6.15#364
tomaspinho merged 2 commits intotomaspinho:masterfrom
Prince213:push-orqplqmxtkux

Conversation

@Prince213
Copy link
Contributor

@Prince213 Prince213 commented May 31, 2025

EXTRA_CFLAGS is no longer supported, use ccflags-y instead. (See kernel documentation for v6.14 and v6.15)

Related:

Downstream issue: NixOS/nixpkgs#412107

@tomaspinho
Copy link
Owner

Thanks for this @Prince213. However, before merging, we'll need to find a way to make this backwards-compatible. Ubuntu LTS is on <= 6.12 and I don't want us to break everyone else 😄

@Prince213
Copy link
Contributor Author

Hi @tomaspinho, ccflags-y has been introduced since 2007 in torvalds/linux@f77bf01425b11947eeb3b5b54 and the timer_delete_sync change is guarded. Do you have specific lines of change in mind that you feel won't be backwards-compatible?

@tomaspinho
Copy link
Owner

The snapshot this module tree is based on is much more recent than 2007, it's from 2017-2018. So I'm surprised Realtek wasn't using the newer variable at the time.

Anyway, would you be able to test a build of your branch for 6.12 or 6.10? Just for us to be extra careful. Thanks!

@Prince213
Copy link
Contributor Author

Nixpkgs don't have linux 6.10 as it has already reached EOL, so I tested building for 6.12 both locally and on CI and it builds without issue.

CI logs: https://logs.ofborg.org/?key=nixos/nixpkgs.412744&attempt_id=57d44928-45b7-411b-8848-a30627fb08be.

@tomaspinho
Copy link
Owner

Thanks for testing it! Merging.

@tomaspinho tomaspinho merged commit 66c015a into tomaspinho:master May 31, 2025
@Prince213
Copy link
Contributor Author

Thanks!

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants