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

mixin.mk, regular.mk: fix portability

Browse Source 
mixin/regular-desktop can be used in non-x86 builds
where dualboot situation tends to be more rare;
let's keep this installer feature (tweaking installer
to pick up "other" filesystems) to regular.mk.
This commit is contained in:
Anton Midyukov 2018-12-24 18:56:00 +07:00 committed by Michael Shigorin
parent ac489474a3
commit c6b80f3457
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf.d/mixin.mk
View File

@ -50,7 +50,6 @@ mixin/regular-x11: use/luks use/volumes/regular \
# common WM live/installer bits
mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit)
@$(call add,THE_PACKAGES,installer-feature-desktop-other-fs-stage2)
@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
@$(call add,THE_BRANDING,alterator graphics indexhtml notes)
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))

1
conf.d/regular.mk
View File

@ -31,6 +31,7 @@ distro/.regular-desktop: distro/.regular-wm \
@$(call add,THE_BRANDING,bootloader)
@$(call add,THE_PACKAGES,upower bluez)
@$(call add,THE_PACKAGES,vconsole-setup-kludge) #28805
@$(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)