From 753d82732033f5aad86af12410d380cd3505c2e2 Mon Sep 17 00:00:00 2001
From: Michael Shigorin <mike@altlinux.org>
Date: Thu, 21 Feb 2013 13:49:32 +0400
Subject: [PATCH] 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.
---
 conf.d/regular.mk            | 4 ++--
 conf.d/server.mk             | 3 +--
 features.in/kernel/README    | 5 +++++
 features.in/kernel/config.mk | 3 +++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/conf.d/regular.mk b/conf.d/regular.mk
index 22a1cb9b..35f0dd58 100644
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -4,11 +4,11 @@ ifeq (distro,$(IMAGE_CLASS))
 # WM base target
 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/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,rescue extra))
 	@$(call add,THE_BRANDING,indexhtml notes alterator)
-	@$(call add,KMODULES,r8168)
 	@$(call try,SAVE_PROFILE,yes)
 
 # DE base target
diff --git a/conf.d/server.mk b/conf.d/server.mk
index db54d7ca..c1348a06 100644
--- a/conf.d/server.mk
+++ b/conf.d/server.mk
@@ -9,7 +9,7 @@ distro/server-nano: distro/.server-base \
 	@$(call add,BASE_LISTS,$(call tags,server network))
 	@$(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
 	@$(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 \
 	use/firmware/server use/firmware/cpu use/power/acpi/button +wireless
 	@$(call set,STAGE1_KFLAVOUR,std-def)
 	@$(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,drbd83 kvm)
 	@$(call add,BASE_LISTS,ovz-server)
diff --git a/features.in/kernel/README b/features.in/kernel/README
index 0ded0d5c..1f96dccd 100644
--- a/features.in/kernel/README
+++ b/features.in/kernel/README
@@ -1,2 +1,7 @@
 Эта фича привносит код, имеющий смысл при добавлении в образ ядра,
 и задаёт начальный вариант такового.
+
+Также занимается складированием наборов имён пакетов kernel-modules-*
+с тем, чтобы избавить релиз-менеджеров от необходимости учитывать
+полные списки и точные имена дополнительных модулей для поддержки,
+скажем, Ethernet.
diff --git a/features.in/kernel/config.mk b/features.in/kernel/config.mk
index 4d0986fc..deb40cfb 100644
--- a/features.in/kernel/config.mk
+++ b/features.in/kernel/config.mk
@@ -8,3 +8,6 @@ endif
 use/kernel:
 	@$(call add_feature)
 	@$(call set,KFLAVOURS,std-def)
+
+use/kernel/net:
+	@$(call add,THE_KMODULES,e1000e igb r8168 rtl8168)