Skip to content

M
mkimage-profiles
Commit 10ba71f4 authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin
Browse files
Options

mixin.mk, regular.mk: refactor desktop targets

...as more packages become available across the arches.
parent 3d2d80a2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
conf.d/mixin.mk
View file @ 10ba71f4
...@@ -54,6 +54,9 @@ mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs ...@@ -54,6 +54,9 @@ mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
@$(call add,THE_BRANDING,alterator graphics indexhtml notes) @$(call add,THE_BRANDING,alterator graphics indexhtml notes)
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER)) @$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,imagewriter) @$(call set,THE_IMAGEWRITER,imagewriter)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \ mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
use/fonts/ttf/redhat use/x11/wmaker use/fonts/ttf/redhat use/x11/wmaker
......
conf.d/regular.mk
View file @ 10ba71f4
...@@ -29,11 +29,8 @@ distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \ ...@@ -29,11 +29,8 @@ distro/.regular-wm: distro/.regular-x11 mixin/regular-x11 \
distro/.regular-desktop: distro/.regular-wm \ distro/.regular-desktop: distro/.regular-wm \
use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd use/syslinux/ui/gfxboot use/firmware/laptop use/efi/refind +systemd
@$(call add,THE_BRANDING,bootloader) @$(call add,THE_BRANDING,bootloader)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,THE_PACKAGES,vconsole-setup-kludge) #28805 @$(call add,THE_PACKAGES,vconsole-setup-kludge) #28805
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2) @$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @: distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
......
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