Skip to content

M
mkimage-profiles
Commit 3524d73b authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov
Browse files
Options

desktop.mk, live.mk, live: Get rid of acpi

Apparently we don't want it with systemd-logind.
parent c0dbfd71
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
conf.d/desktop.mk
View file @ 3524d73b
...@@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS)) ...@@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS))
distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
@$(call set,INSTALLER,desktop) @$(call set,INSTALLER,desktop)
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @: distro/.desktop-mini: distro/.desktop-base use/x11/xdm; @:
distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @: distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
......
conf.d/live.mk
View file @ 3524d73b
...@@ -15,7 +15,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth ...@@ -15,7 +15,7 @@ distro/rescue-remote: distro/.base use/rescue/base use/stage2/net-eth
distro/syslinux: distro/.boot \ distro/syslinux: distro/.boot \
use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @: use/syslinux/localboot.cfg use/syslinux/ui/vesamenu use/hdt; @:
distro/.live-base: distro/.base use/live/base use/power/acpi/button; @: distro/.live-base: distro/.base use/live/base; @:
distro/.live-x11: distro/.live-base use/live/x11; @: distro/.live-x11: distro/.live-base use/live/x11; @:
distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \ distro/.live-desktop: distro/.base +live use/live/install use/stage2/net-eth \
...@@ -24,7 +24,7 @@ distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @: ...@@ -24,7 +24,7 @@ distro/.live-desktop-ru: distro/.live-desktop use/live/ru; @:
distro/.live-kiosk: distro/.base use/live/base use/live/autologin \ distro/.live-kiosk: distro/.base use/live/base use/live/autologin \
use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \ use/syslinux/timeout/1 use/cleanup use/stage2/net-eth \
use/fonts/otf/adobe +power use/fonts/otf/adobe
@$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common') @$(call add,CLEANUP_PACKAGES,'alterator*' 'guile*' 'vim-common')
@$(call set,SYSLINUX_UI,none) @$(call set,SYSLINUX_UI,none)
@$(call set,SYSLINUX_CFG,live) @$(call set,SYSLINUX_CFG,live)
...@@ -115,7 +115,7 @@ distro/live-gimp: distro/live-icewm use/live/ru ...@@ -115,7 +115,7 @@ distro/live-gimp: distro/live-icewm use/live/ru
@$(call add,LIVE_PACKAGES,design-graphics-sisyphus2) @$(call add,LIVE_PACKAGES,design-graphics-sisyphus2)
# NB: use/browser won't do as it provides a *single* browser ATM # NB: use/browser won't do as it provides a *single* browser ATM
distro/live-privacy: distro/.base +power +efi +systemd +vmguest \ distro/live-privacy: distro/.base +efi +systemd +vmguest \
use/live/base use/live/privacy use/live/ru \ use/live/base use/live/privacy use/live/ru \
use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \ use/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \
use/browser/firefox/esr use/browser/firefox/i18n use/sound \ use/browser/firefox/esr use/browser/firefox/i18n use/sound \
......
features.in/live/config.mk
View file @ 3524d73b
...@@ -36,7 +36,7 @@ endif ...@@ -36,7 +36,7 @@ endif
# graphical target (not enforcing xorg drivers or blobs) # graphical target (not enforcing xorg drivers or blobs)
use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \ use/live/x11: use/live/base use/deflogin/desktop use/x11-autologin use/sound \
use/fonts/otf/adobe use/fonts/otf/mozilla +power +efi use/fonts/otf/adobe use/fonts/otf/mozilla +efi
@$(call add,LIVE_LISTS,$(call tags,desktop && (live || network))) @$(call add,LIVE_LISTS,$(call tags,desktop && (live || network)))
@$(call add,LIVE_LISTS,$(call tags,base l10n)) @$(call add,LIVE_LISTS,$(call tags,base l10n))
@$(call add,LIVE_PACKAGES,pciutils) @$(call add,LIVE_PACKAGES,pciutils)
......
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