Commit 3331e038 authored by Michael Shigorin's avatar Michael Shigorin

live.mk, regular.mk: move use/stage2/cifs upwards

sin@ was overly optimistic about CIFS boot needs, I think he rather meant starterkits so let's move this into regular build rules -- use/stage2/cifs is the only addition (the other things just got re-messed up).
parent 2b3455c2
......@@ -15,7 +15,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
distro/syslinux: distro/.init \
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
distro/.live-base: distro/.base use/live/base use/power/acpi/button use/stage2/cifs; @:
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @:
distro/.live-x11: distro/.live-base use/live/x11; @:
distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
......
......@@ -10,10 +10,12 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest +efi; @:
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-base +vmguest +wireless \
use/x11/amdgpu use/live/x11 use/live/install use/live/suspend \
use/live/repo use/live/rw use/luks use/x11/wacom use/ntp/client \
use/branding use/browser/firefox/live use/browser/firefox/i18n \
use/browser/firefox/h264 use/volumes/regular use/services/lvm2-disable
use/stage2/cifs use/live/rw use/live/x11 use/live/repo \
use/live/install use/live/suspend use/browser/firefox/live \
use/browser/firefox/i18n use/browser/firefox/h264 \
use/branding use/x11/wacom use/x11/amdgpu \
use/ntp/client use/services/lvm2-disable \
use/luks use/volumes/regular
@$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,LIVE_PACKAGES,btrfs-progs)
@$(call add,LIVE_LISTS,$(call tags,(base || desktop) && regular))
......
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