stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conf.d/server.mk: dropped wifi kernel modules

Browse Source 
There's no real reason to keep bcmwl and ndiswrapper
around exclusively as the currently available support
vastly takes over the early attempts at the task.

(it's not about bare firmware though, and some day
something like use/hardware/wireless should get in)
This commit is contained in:
Michael Shigorin 2012-04-10 21:00:30 +03:00
parent 4858791145
commit dc3002560a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/server.mk
View File

@ -19,12 +19,11 @@ distro/server-mini: distro/.server-base use/cleanup/x11-alterator
distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @: distro/server-systemd: distro/server-mini use/systemd use/bootloader/lilo; @:
distro/server-ovz: distro/server-mini use/install2/net \ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
use/hdt use/rescue use/firmware/server use/power/acpi/button use/firmware/server use/firmware/wireless use/power/acpi/button
@$(call set,STAGE1_KFLAVOUR,std-def) @$(call set,STAGE1_KFLAVOUR,std-def)
@$(call set,KFLAVOURS,std-def ovz-el) @$(call set,KFLAVOURS,std-def ovz-el)
@$(call add,BASE_KMODULES,rtl8168 rtl8192) @$(call add,BASE_KMODULES,rtl8168 rtl8192)
@$(call add,MAIN_KMODULES,bcmwl ndiswrapper)
@$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons) @$(call add,MAIN_KMODULES,ipset ipt-netflow opendpi pf_ring xtables-addons)
@$(call add,MAIN_KMODULES,drbd83 kvm) @$(call add,MAIN_KMODULES,drbd83 kvm)
@$(call add,BASE_LISTS,ovz-server) @$(call add,BASE_LISTS,ovz-server)

1
features.in/firmware/config.mk
View File

@ -11,6 +11,7 @@ use/firmware/server: use/firmware
# NB: individual firmwarez would sometimes conflict # NB: individual firmwarez would sometimes conflict
# with ones newly merged into firmware-linux # with ones newly merged into firmware-linux
# FIXME: kernel modules rather belong to use/hardware
use/firmware/wireless: use/firmware use/firmware/wireless: use/firmware
@$(call add,THE_KMODULES,bcmwl ndiswrapper) @$(call add,THE_KMODULES,bcmwl ndiswrapper)
@$(call add,THE_PACKAGES,firmware-acx100) @$(call add,THE_PACKAGES,firmware-acx100)