keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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).
This commit is contained in:
Michael Shigorin 2018-10-15 20:57:59 +03:00
parent 2b3455c29a
commit 3331e03888
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.d/live.mk
View File

@ -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
conf.d/regular.mk
View File

@ -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))