From 5d4b1032617cb632522d459ac9c431d6ebdeb23d Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Mon, 12 Apr 2021 23:05:25 +0700 Subject: [PATCH] Drop net-eth support --- conf.d/mixin.mk | 2 +- conf.d/regular.mk | 2 +- conf.d/server.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk index e097034f..a128ea17 100644 --- a/conf.d/mixin.mk +++ b/conf.d/mixin.mk @@ -48,7 +48,7 @@ mixin/regular-x11: use/luks use/volumes/regular \ @$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop) # common WM live/installer bits -mixin/regular-desktop: +alsa +power +nm-native use/net-eth \ +mixin/regular-desktop: +alsa +power +nm-native \ use/x11/xorg use/xdg-user-dirs use/l10n \ use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes @$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index d3b633fb..2a063a18 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -2,7 +2,7 @@ ifeq (distro,$(IMAGE_CLASS)) # common ground (really lowlevel) -distro/.regular-bare: distro/.base +net-eth use/kernel/net use/docs/license \ +distro/.regular-bare: distro/.base use/kernel/net use/docs/license \ use/stage2/fs use/stage2/hid use/stage2/md \ use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb diff --git a/conf.d/server.mk b/conf.d/server.mk index f2364308..78ec3473 100644 --- a/conf.d/server.mk +++ b/conf.d/server.mk @@ -10,7 +10,7 @@ distro/server-nano: distro/.server-base use/bootloader/lilo +power \ @$(call add,BASE_LISTS,$(call tags,server network)) @$(call add,BASE_PACKAGES,dhcpcd cpio) -distro/server-mini: distro/.server-base +net-eth \ +distro/server-mini: distro/.server-base \ use/server/mini use/kernel/net use/efi use/power/acpi/button @$(call set,INSTALLER,altlinux-server) @$(call add,BASE_PACKAGES,make-initrd-mdadm make-initrd-lvm)