Skip to content

M
mkimage-profiles
Commit 984aded5 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

mixin.mk: drop notes on e2k yet again

Still have to refer to MCST instead at the moment....
parent 338f8db6
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
conf.d/mixin.mk
View file @ 984aded5
...@@ -17,7 +17,7 @@ mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \ ...@@ -17,7 +17,7 @@ mixin/e2k-desktop: use/e2k/x11 use/l10n/default/ru_RU \
@$(call add,THE_PACKAGES,fonts-bitmap-terminus) @$(call add,THE_PACKAGES,fonts-bitmap-terminus)
mixin/e2k-livecd-install: use/e2k/x11 mixin/e2k-livecd-install: use/e2k/x11
@$(call add,THE_PACKAGES,livecd-install alterator-notes) @$(call add,THE_PACKAGES,livecd-install)
@$(call add,THE_PACKAGES,fdisk hdparm rsync openssh vim-console) @$(call add,THE_PACKAGES,fdisk hdparm rsync openssh vim-console)
@$(call add,THE_PACKAGES,apt-repo) @$(call add,THE_PACKAGES,apt-repo)
...@@ -50,9 +50,11 @@ mixin/regular-x11: use/luks use/volumes/regular \ ...@@ -50,9 +50,11 @@ mixin/regular-x11: use/luks use/volumes/regular \
# common WM live/installer bits # common WM live/installer bits
mixin/regular-desktop: +alsa +power use/x11/xorg use/xdg-user-dirs use/l10n \ mixin/regular-desktop: +alsa +power use/x11/xorg use/xdg-user-dirs use/l10n \
use/fonts/otf/adobe use/fonts/otf/mozilla use/net-eth use/branding/notes use/fonts/otf/adobe use/fonts/otf/mozilla use/net-eth use/branding/notes
@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit) @$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools)
@$(call add,THE_PACKAGES,alterator-notes dvd+rw-tools)
@$(call add,THE_BRANDING,alterator graphics indexhtml) @$(call add,THE_BRANDING,alterator graphics indexhtml)
ifneq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_BRANDING,notes)
endif
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER)) @$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,altmediawriter) @$(call set,THE_IMAGEWRITER,altmediawriter)
@$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess) @$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess)
......
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