Skip to content

linuxPackages*.xmm7360-pci: unbreak for kernels > 5.14 - #147709

Closed
flokli wants to merge 1 commit into
NixOS:masterfrom
flokli:xmm7360-pci-new-kernels
Closed

flokli wants to merge 1 commit into
NixOS:masterfrom
flokli:xmm7360-pci-new-kernels

Conversation

@flokli

@flokli flokli commented Nov 28, 2021 •

Copy link
Copy Markdown
Member

As of v5.15, the put_tty_driver alias has been dropped in favor of
directly calling tty_driver_kref_put (9f90a4ddef4e). Apply this change
in the xmm7360 driver in order to allow building on recent kernels.

See xmm7360/xmm7360-pci#152

Motivation for this change
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/)
  • 21.11 Release Notes (or backporting 21.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.

@flokli
flokli requested a review from mweinelt November 28, 2021 13:11
As of v5.15, the `put_tty_driver` alias has been dropped in favor of
directly calling `tty_driver_kref_put` (9f90a4ddef4e). Apply this change
in the xmm7360 driver in order to allow building on recent kernels.

See xmm7360/xmm7360-pci#152
@flokli
flokli force-pushed the xmm7360-pci-new-kernels branch from 40dbdd7 to c8faef5 Compare November 28, 2021 13:13
@flokli

flokli commented Nov 28, 2021

Copy link
Copy Markdown
Member Author

Hold on, this doesn't seem to compile right:

make -C /nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build M=/build/source modules
make[1]: Entering directory '/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build'
  CC [M]  /build/source/xmm7360.o
/build/source/xmm7360.c:1322:16: error: initialization of 'unsigned int (*)(struct tty_struct *)' from incompatible pointer type 'int (*)(struct tty_struct *)' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
 1322 |  .write_room = xmm7360_tty_write_room,
      |                ^~~~~~~~~~~~~~~~~~~~~~
/build/source/xmm7360.c:1322:16: note: (near initialization for 'xmm7360_tty_ops.write_room')
cc1: some warnings being treated as errors
make[3]: *** [/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/scripts/Makefile.build:271: /build/source/xmm7360.o] Error 1
make[2]: *** [/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:1858: /build/source] Error 2
make[1]: *** [/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:220: __sub-make] Error 2
make[1]: Leaving directory '/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build'
make: *** [Makefile:9: default] Error 2
error: builder for '/nix/store/fsxn9hy9jjgc70qz7vr0468wcwps3pb2-xmm7360-pci-unstable-2021-07-19.drv' failed with exit code 2;
       last 10 log lines:
       > /build/source/xmm7360.c:1322:16: error: initialization of 'unsigned int (*)(struct tty_struct *)' from incompatible pointer type 'int (*)(struct tty_struct *)' [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wincompatible-pointer-types-Werror=incompatible-pointer-types8;;]
       >  1322 |  .write_room = xmm7360_tty_write_room,
       >       |                ^~~~~~~~~~~~~~~~~~~~~~
       > /build/source/xmm7360.c:1322:16: note: (near initialization for 'xmm7360_tty_ops.write_room')
       > cc1: some warnings being treated as errors
       > make[3]: *** [/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/scripts/Makefile.build:271: /build/source/xmm7360.o] Error 1
       > make[2]: *** [/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:1858: /build/source] Error 2
       > make[1]: *** [/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/source/Makefile:220: __sub-make] Error 2
       > make[1]: Leaving directory '/nix/store/q8bsakfb9cg8mhdg2d5a10wiag4dbysi-linux-5.14.21-dev/lib/modules/5.14.21/build'
       > make: *** [Makefile:9: default] Error 2
       For full logs, run 'nix log /nix/store/fsxn9hy9jjgc70qz7vr0468wcwps3pb2-xmm7360-pci-unstable-2021-07-19.drv'.

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.

1 participant