diff --git a/conf.d/live.mk b/conf.d/live.mk index 2f72b218..fa14db5a 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -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 \ diff --git a/conf.d/regular.mk b/conf.d/regular.mk index d05c622e..47284115 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -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))