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

regular.mk: shuffle +wireless along

Browse Source 
It's all started with glebfm@ wondering why
kernel-modules-v4l-std-def ends up installed
with altlinux-p7-server-ovz.iso; this has been
tossed in by kernel-modules-staging-std-def
which has been requested by +wireless.

WiFi support is nice to have handy when one hits
a wifi-only device and no means to bring networking
up (the infamous "unzip.zip" situation) but it's
a bit too much to force a bunch of extra drivers
specifically known for sub-par or unknown quality
onto everyone installing an ALT Linux based server.

So let's contain that feature to desktop/rescue images
and exclude it from their common base with server ones.
This commit is contained in:
Michael Shigorin 2015-05-31 17:49:11 +03:00
parent 80c34ffad8
commit 1d0d1ceaef
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf.d/regular.mk
View File

@ -6,10 +6,10 @@ distro/.regular-bare: distro/.base +net-eth use/kernel/net
@$(call try,SAVE_PROFILE,yes)
# base target (for most images)
distro/.regular-base: distro/.regular-bare use/memtest +efi +wireless; @:
distro/.regular-base: distro/.regular-bare use/memtest +efi; @:
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-base +vmguest \
distro/.regular-x11: distro/.regular-base +vmguest +wireless \
use/live/x11 use/live/install use/live/suspend \
use/live/repo use/live/rw use/luks use/x11/wacom \
use/branding use/browser/firefox/live use/browser/firefox/i18n
@ -82,7 +82,7 @@ distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
@$(call add,STAGE2_BOOTARGS,quiet)
distro/.regular-install-x11: distro/.regular-install \
use/install2/suspend mixin/regular-desktop +vmguest
use/install2/suspend mixin/regular-desktop +vmguest +wireless
@$(call set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop))
@ -191,7 +191,8 @@ distro/regular-kde5: distro/.regular-desktop \
distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
use/hdt use/syslinux/ui/menu use/syslinux/rescue_fm.cfg \
use/syslinux/timeout/200 use/mediacheck test/rescue/no-x11
use/syslinux/timeout/200 use/mediacheck test/rescue/no-x11 \
+wireless
@$(call set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm)