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

linux.kernel: enable build of stk1160 modules #31364

Merged
merged 1 commit into from Nov 8, 2017

Conversation

makefu
Copy link
Contributor

@makefu makefu commented Nov 7, 2017

Motivation for this change

Right now, for each new kernel or stdenv update i will have to build my own kernel with the stk1160 modules enabled (see http://cgit.euer.krebsco.de/stockholm/tree/makefu/2configs/hw/stk1160.nix ). This PR introduces the stk1160 module into the kernel configuration

Things done
  • Tested using sandboxing
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@@ -573,6 +573,9 @@ with stdenv.lib;
''}
MEDIA_USB_SUPPORT y
MEDIA_PCI_SUPPORT y
MEDIA_ANALOG_TV_SUPPORT y
VIDEO_STK1160_COMMON m
VIDEO_STK1160_AC97 y
Copy link
Contributor

Choose a reason for hiding this comment

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

Which kernel version has VIDEO_STK1160_AC97? I only see:

drivers/media/usb/Makefile:obj-$(CONFIG_VIDEO_STK1160) += stk1160/
drivers/media/usb/stk1160/Kconfig:config VIDEO_STK1160_COMMON
drivers/media/usb/stk1160/Kconfig:config VIDEO_STK1160
drivers/media/usb/stk1160/Kconfig:      depends on VIDEO_STK1160_COMMON
drivers/media/usb/stk1160/Makefile:obj-$(CONFIG_VIDEO_STK1160) += stk1160.o

Copy link
Contributor Author

@makefu makefu Nov 7, 2017

Choose a reason for hiding this comment

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

4.9 kernel still has it (which i am using right now). It seems to have been removed with https://patchwork.linuxtv.org/patch/37808/ . according to https://cateee.net/lkddb/web-lkddb/VIDEO_STK1160_AC97.html it is available in "Linux kernels: 3.7–3.19, 4.0–4.10, 4.10+HEAD"

I will make this a conditional just like the other options which are only available in certain kernel versions

@makefu
Copy link
Contributor Author

makefu commented Nov 8, 2017

@dezgeg i've added a conditional for the AC97 option.

@dezgeg
Copy link
Contributor

dezgeg commented Nov 8, 2017

Ok, with that 4.4, 4.9 and latest kernels build. Thanks.

@dezgeg dezgeg merged commit 292f605 into NixOS:master Nov 8, 2017
@makefu makefu deleted the pkgs/linux.kernel/stk1160 branch November 20, 2017 15:29
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.

None yet

3 participants