Commit 753d8273 authored by Michael Shigorin's avatar Michael Shigorin

kernel: introduced use/kernel/net target

The various *8168 and friends among kernel modules have finally been pushed into a designated target so that RM doesn't have to care which particular additional ethernet modules are available in this particular branch and kernel. Tweak distros as appropriate. NB: *maybe* this is required by distro/.base either.
parent ca517ecc
...@@ -4,11 +4,11 @@ ifeq (distro,$(IMAGE_CLASS)) ...@@ -4,11 +4,11 @@ ifeq (distro,$(IMAGE_CLASS))
# WM base target # WM base target
distro/.regular-base: distro/.base +live +wireless use/live/ru \ distro/.regular-base: distro/.base +live +wireless use/live/ru \
use/live/install use/live/repo use/live/net-eth use/x11/3d-free \ use/live/install use/live/repo use/live/net-eth use/x11/3d-free \
use/efi/signed use/luks +vmguest use/memtest use/branding use/efi/signed use/luks +vmguest use/memtest use/branding \
use/kernel/net
@$(call add,LIVE_LISTS,$(call tags,base regular)) @$(call add,LIVE_LISTS,$(call tags,base regular))
@$(call add,LIVE_LISTS,$(call tags,rescue extra)) @$(call add,LIVE_LISTS,$(call tags,rescue extra))
@$(call add,THE_BRANDING,indexhtml notes alterator) @$(call add,THE_BRANDING,indexhtml notes alterator)
@$(call add,KMODULES,r8168)
@$(call try,SAVE_PROFILE,yes) @$(call try,SAVE_PROFILE,yes)
# DE base target # DE base target
......
...@@ -9,7 +9,7 @@ distro/server-nano: distro/.server-base \ ...@@ -9,7 +9,7 @@ distro/server-nano: distro/.server-base \
@$(call add,BASE_LISTS,$(call tags,server network)) @$(call add,BASE_LISTS,$(call tags,server network))
@$(call add,BASE_PACKAGES,dhcpcd cpio) @$(call add,BASE_PACKAGES,dhcpcd cpio)
distro/server-mini: distro/.server-base use/server/mini \ distro/server-mini: distro/.server-base use/server/mini use/kernel/net \
use/cleanup/x11-alterator use/efi use/cleanup/x11-alterator use/efi
@$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm) @$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)
...@@ -17,7 +17,6 @@ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \ ...@@ -17,7 +17,6 @@ distro/server-ovz: distro/server-mini use/install2/net use/hdt use/rescue \
use/firmware/server use/firmware/cpu use/power/acpi/button +wireless use/firmware/server use/firmware/cpu use/power/acpi/button +wireless
@$(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)
@$(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)
......
Эта фича привносит код, имеющий смысл при добавлении в образ ядра, Эта фича привносит код, имеющий смысл при добавлении в образ ядра,
и задаёт начальный вариант такового. и задаёт начальный вариант такового.
Также занимается складированием наборов имён пакетов kernel-modules-*
с тем, чтобы избавить релиз-менеджеров от необходимости учитывать
полные списки и точные имена дополнительных модулей для поддержки,
скажем, Ethernet.
...@@ -8,3 +8,6 @@ endif ...@@ -8,3 +8,6 @@ endif
use/kernel: use/kernel:
@$(call add_feature) @$(call add_feature)
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
use/kernel/net:
@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment