From 3524d73b8c9d1c3e5999cd20079d737f27433283 Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Tue, 9 Jul 2019 20:35:36 +0300 Subject: [PATCH] desktop.mk, live.mk, live: Get rid of acpi Apparently we don't want it with systemd-logind. --- conf.d/desktop.mk | 2 +- conf.d/live.mk | 6 +++--- features.in/live/config.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index 6662542a..04929e94 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -4,7 +4,7 @@ ifeq (distro,$(IMAGE_CLASS)) distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg @$(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; @: diff --git a/conf.d/live.mk b/conf.d/live.mk index 515f2360..246b58d9 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/.boot \ 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-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; @: distro/.live-kiosk: distro/.base use/live/base use/live/autologin \ 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 set,SYSLINUX_UI,none) @$(call set,SYSLINUX_CFG,live) @@ -115,7 +115,7 @@ distro/live-gimp: distro/live-icewm use/live/ru @$(call add,LIVE_PACKAGES,design-graphics-sisyphus2) # 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/x11/xorg use/x11/lightdm/gtk use/x11/mate use/x11-autologin \ use/browser/firefox/esr use/browser/firefox/i18n use/sound \ diff --git a/features.in/live/config.mk b/features.in/live/config.mk index 497b35c6..5f9f6435 100644 --- a/features.in/live/config.mk +++ b/features.in/live/config.mk @@ -36,7 +36,7 @@ endif # graphical target (not enforcing xorg drivers or blobs) 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,base l10n)) @$(call add,LIVE_PACKAGES,pciutils)