Skip to content

M
mkimage-profiles
Commit 1d0d1cea authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

regular.mk: shuffle +wireless along

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.
parent 80c34ffa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
conf.d/regular.mk
View file @ 1d0d1cea
...@@ -6,10 +6,10 @@ distro/.regular-bare: distro/.base +net-eth use/kernel/net ...@@ -6,10 +6,10 @@ distro/.regular-bare: distro/.base +net-eth use/kernel/net
@$(call try,SAVE_PROFILE,yes) @$(call try,SAVE_PROFILE,yes)
# base target (for most images) # 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) # 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/x11 use/live/install use/live/suspend \
use/live/repo use/live/rw use/luks use/x11/wacom \ use/live/repo use/live/rw use/luks use/x11/wacom \
use/branding use/browser/firefox/live use/browser/firefox/i18n use/branding use/browser/firefox/live use/browser/firefox/i18n
...@@ -82,7 +82,7 @@ distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \ ...@@ -82,7 +82,7 @@ distro/regular-jeos: distro/.regular-bare use/isohybrid +sysvinit \
@$(call add,STAGE2_BOOTARGS,quiet) @$(call add,STAGE2_BOOTARGS,quiet)
distro/.regular-install-x11: distro/.regular-install \ 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 set,INSTALLER,altlinux-desktop)
@$(call add,THE_LISTS,$(call tags,regular desktop)) @$(call add,THE_LISTS,$(call tags,regular desktop))
...@@ -191,7 +191,8 @@ distro/regular-kde5: distro/.regular-desktop \ ...@@ -191,7 +191,8 @@ distro/regular-kde5: distro/.regular-desktop \
distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \ distro/regular-rescue: distro/.regular-base use/rescue/rw use/luks \
use/branding use/efi/refind use/efi/shell use/efi/memtest86 \ use/branding use/efi/refind use/efi/shell use/efi/memtest86 \
use/hdt use/syslinux/ui/menu use/syslinux/rescue_fm.cfg \ 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 set,KFLAVOURS,un-def)
@$(call add,RESCUE_PACKAGES,gpm) @$(call add,RESCUE_PACKAGES,gpm)
......
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