Skip to content

M
mkimage-profiles
Commit 649769e7 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

Refactoring regular targets

Reduce the level of semantic binding to x11 Remove unnecessary targets. Set /use/lightdm/gtk as default, which we override if necessary.
parent 168030cd
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 62 deletions
conf.d/mixin.mk
View file @ 649769e7
...@@ -53,25 +53,23 @@ ifeq (,$(filter-out aarch64 x86_64,$(ARCH))) ...@@ -53,25 +53,23 @@ ifeq (,$(filter-out aarch64 x86_64,$(ARCH)))
endif endif
### regular.mk ### regular.mk
mixin/regular-x11: use/browser/chromium \ mixin/regular-desktop: +alsa +nm-native use/x11/lightdm/gtk \
use/branding use/ntp/chrony use/services/lvm2-disable
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular && !extra))
@$(call add,THE_PACKAGES,disable-usb-autosuspend)
@$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
ifneq (sisyphus,$(BRANCH))
@$(call set,FX_FLAVOUR,-esr)
endif
# common WM live/installer bits
mixin/regular-desktop: +alsa +nm-native \
use/x11/xorg use/xdg-user-dirs use/l10n use/l10n/xkb/switch/alt_shift \ use/x11/xorg use/xdg-user-dirs use/l10n use/l10n/xkb/switch/alt_shift \
use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes \
use/services/bluetooth-enable use/browser/chromium \
use/branding use/ntp/chrony use/services/lvm2-disable \
use/firmware/laptop
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_PACKAGES,xorg-drv-vmware) # for virtualbox with VMSVGA
endif
@$(call set,LOCALES,en_US ru_RU pt_BR) @$(call set,LOCALES,en_US ru_RU pt_BR)
@$(call add,THE_LISTS,task-common/system-base)
@$(call add,THE_LISTS,task-common/desktop-base)
@$(call add,THE_PACKAGES,power-profiles-daemon) @$(call add,THE_PACKAGES,power-profiles-daemon)
@$(call add,THE_PACKAGES,pam-limits-desktop polkit dvd+rw-tools) @$(call add,THE_PACKAGES,bluez)
@$(call add,THE_PACKAGES,eepm) @$(call add,THE_PACKAGES,eepm)
@$(call add,THE_PACKAGES,sudo) @$(call add,THE_PACKAGES,sudo)
@$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,THE_BRANDING,alterator graphics indexhtml) @$(call add,THE_BRANDING,alterator graphics indexhtml)
ifneq (,$(filter-out i586 x86_64,$(ARCH))) ifneq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,SPLASH_ARGS,splash) @$(call set,SPLASH_ARGS,splash)
...@@ -81,14 +79,25 @@ ifneq (,$(filter-out e2k%,$(ARCH))) ...@@ -81,14 +79,25 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
endif endif
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER)) @$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call try,THE_IMAGEWRITER,altmediawriter) @$(call try,THE_IMAGEWRITER,altmediawriter)
@$(call add,THE_PACKAGES,upower udev-rules-rfkill-uaccess) @$(call add,THE_LISTS,tagged/base+regular)
@$(call add,THE_LISTS,tagged/desktop+regular)
@$(call add,THE_PACKAGES,hunspell-ru-lebedev hunspell-en_US) @$(call add,THE_PACKAGES,hunspell-ru-lebedev hunspell-en_US)
@$(call add,THE_PACKAGES,glmark2 glmark2-es2) @$(call add,THE_PACKAGES,glmark2 glmark2-es2)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind) @$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,cups) @$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord) @$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
@$(call add,CONTROL,fusermount:public) @$(call add,CONTROL,fusermount:public)
@$(call add,CONTROL,libnss-role:disabled) @$(call add,CONTROL,libnss-role:disabled)
ifneq (sisyphus,$(BRANCH))
@$(call set,FX_FLAVOUR,-esr)
endif
mixin/regular-desktop-install: +live-installer use/live-install/desktop \
use/live-install/oem use/live-install/repo \
use/grub/safe-mode.cfg
@$(call add,MAIN_LISTS,kernel-headers)
@$(call set,MAIN_KERNEL_SAVE,yes)
mixin/desktop-extra: mixin/desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra)) @$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
......
conf.d/regular-vm.mk
View file @ 649769e7
...@@ -22,13 +22,13 @@ endif ...@@ -22,13 +22,13 @@ endif
@$(call add,KMODULES,staging) @$(call add,KMODULES,staging)
vm/.regular-desktop: vm/systemd +systemd +plymouth \ vm/.regular-desktop: vm/systemd +systemd +plymouth \
mixin/regular-vm-base mixin/regular-x11 \ mixin/regular-vm-base \
mixin/regular-desktop use/oem/vnc \ mixin/regular-desktop use/oem/vnc \
use/services/bluetooth-enable use/services/bluetooth-enable
@$(call add,THE_PACKAGES,bluez) @$(call add,THE_PACKAGES,bluez)
@$(call try,VM_SIZE,8589934592) @$(call try,VM_SIZE,8589934592)
vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk vm/.regular-gtk: vm/.regular-desktop
@$(call add,THE_PACKAGES,blueman) @$(call add,THE_PACKAGES,blueman)
vm/.regular-jeos-systemd: vm/systemd-net use/net/networkd/resolved \ vm/.regular-jeos-systemd: vm/systemd-net use/net/networkd/resolved \
......
conf.d/regular.mk
View file @ 649769e7
...@@ -27,18 +27,6 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest \ ...@@ -27,18 +27,6 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest \
use/efi/shell use/efi/dtb +efi \ use/efi/shell use/efi/dtb +efi \
use/luks use/volumes/regular; @: use/luks use/volumes/regular; @:
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
use/x11/wacom use/x11/amdgpu +wireless \
use/live/x11 use/live/repo \
use/live/suspend \
use/syslinux/ui/gfxboot use/grub/ui/gfxboot use/grub/safe-mode.cfg
@$(call add,THE_BRANDING,bootloader)
@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))
@$(call add,LIVE_PACKAGES,livecd-rescue-base-utils)
@$(call add,MAIN_LISTS,kernel-headers)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
# Network install # Network install
ifeq (,$(filter-out i586 x86_64 aarch64 riscv64 loongarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 riscv64 loongarch64,$(ARCH)))
distro/regular-net-install: distro/grub-net-install use/grub/safe-mode.cfg use/tty; @: distro/regular-net-install: distro/grub-net-install use/grub/safe-mode.cfg use/tty; @:
...@@ -51,33 +39,23 @@ endif ...@@ -51,33 +39,23 @@ endif
endif endif
endif endif
# WM base target # DE base target
distro/.regular-wm: distro/.regular-x11 \ distro/.regular-desktop-base: distro/.regular-base use/branding/full \
mixin/regular-desktop use/vmguest/dri \ mixin/regular-desktop mixin/regular-desktop-install +wireless \
use/live/rw +live-installer use/live-install/desktop \ use/live/rw use/live/x11 use/live/repo use/vmguest/kvm \
use/live-install/repo use/live/suspend use/grub/ui/gfxboot
@$(call add,THE_BRANDING,bootloader)
@$(call add,LIVE_PACKAGES,livecd-rescue-base-utils)
@$(call set,GRUB_DEFAULT,live) @$(call set,GRUB_DEFAULT,live)
@$(call set,SYSLINUX_DEFAULT,live) @$(call set,SYSLINUX_DEFAULT,live)
@$(call set,MAIN_KERNEL_SAVE,yes)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_PACKAGES,xorg-drv-vmware) # for virtualbox with VMSVGA
endif
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm use/branding/full \
use/firmware/laptop +systemd +vmguest \
use/live-install/oem use/services/bluetooth-enable \
use/live/rescue
@$(call add,THE_PACKAGES,bluez)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit +power; @: distro/.regular-desktop: distro/.regular-desktop-base use/x11/wacom +vmguest \
+systemd +plymouth; @:
# common base for the very bare distros # common base for the very bare distros
distro/.regular-jeos-base: distro/.regular-bare +efi \ distro/.regular-jeos-base: distro/.regular-bare +efi \
use/branding +live-installer-pkg use/live-install/repo use/branding +live-installer-pkg use/live-install/repo \
use/live/rescue
@$(call add,THE_BRANDING,alterator notes) @$(call add,THE_BRANDING,alterator notes)
@$(call add,BASE_PACKAGES,installer-common-stage3) @$(call add,BASE_PACKAGES,installer-common-stage3)
@$(call add,LIVE_PACKAGES,alterator-net-functions) # for run scripts from installer-common-stage3 @$(call add,LIVE_PACKAGES,alterator-net-functions) # for run scripts from installer-common-stage3
...@@ -109,16 +87,16 @@ ifneq (,$(filter-out p10,$(BRANCH))) ...@@ -109,16 +87,16 @@ ifneq (,$(filter-out p10,$(BRANCH)))
@$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,livecd-net-eth)
endif endif
distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \ distro/regular-icewm: distro/.regular-desktop-base use/x11/lightdm/gtk \
mixin/regular-icewm mixin/regular-icewm
@$(call add,THE_PACKAGES,icewm-startup-polkit-gnome) @$(call add,THE_PACKAGES,icewm-startup-polkit-gnome)
distro/regular-icewm-sysv: distro/.regular-desktop-sysv mixin/regular-icewm \ distro/regular-icewm-sysv: distro/.regular-desktop-base mixin/regular-icewm \
use/live/autologin; @: use/live/autologin +sysvinit-desktop; @:
# wdm can't do autologin so add standalone one for livecd # wdm can't do autologin so add standalone one for livecd
distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \ distro/regular-wmaker-sysv: distro/.regular-desktop-base \
mixin/regular-wmaker use/live/autologin mixin/regular-wmaker use/live/autologin +sysvinit-desktop
@$(call add,LIVE_PACKAGES,wmxkbru) @$(call add,LIVE_PACKAGES,wmxkbru)
distro/regular-gnustep-sysv: distro/regular-wmaker-sysv \ distro/regular-gnustep-sysv: distro/regular-wmaker-sysv \
...@@ -128,25 +106,24 @@ distro/regular-gnustep: distro/.regular-desktop use/x11/lightdm/gtk \ ...@@ -128,25 +106,24 @@ distro/regular-gnustep: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-wmaker mixin/regular-gnustep mixin/regular-wmaker mixin/regular-gnustep
@$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome) @$(call add,THE_PACKAGES,wmaker-autostart-polkit-gnome)
distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce; @: distro/regular-xfce: distro/.regular-desktop mixin/regular-xfce; @:
distro/regular-lxde: distro/.regular-desktop use/x11/lightdm/gtk \ distro/regular-lxde: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-lxde; @: mixin/regular-lxde; @:
distro/regular-mate: distro/.regular-gtk mixin/regular-mate; @: distro/regular-mate: distro/.regular-desktop mixin/regular-mate; @:
distro/regular-enlightenment: distro/.regular-gtk use/x11/enlightenment; @: distro/regular-enlightenment: distro/.regular-desktop use/x11/enlightenment; @:
distro/regular-cinnamon: distro/.regular-gtk mixin/regular-cinnamon; @: distro/regular-cinnamon: distro/.regular-desktop mixin/regular-cinnamon; @:
# not .regular-gtk due to gdm vs lightdm
distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \ distro/regular-gnome: distro/.regular-desktop mixin/regular-gnome \
+plymouth use/browser/epiphany \ +plymouth use/browser/epiphany \
use/live-install/vnc/listen; @: use/live-install/vnc/listen; @:
distro/regular-lxqt: distro/.regular-gtk mixin/regular-lxqt +plymouth; @: distro/regular-lxqt: distro/.regular-desktop mixin/regular-lxqt +plymouth; @:
distro/regular-deepin: distro/.regular-gtk mixin/regular-deepin; @: distro/regular-deepin: distro/.regular-desktop mixin/regular-deepin; @:
distro/regular-kde: distro/.regular-desktop +nm \ distro/regular-kde: distro/.regular-desktop +nm \
mixin/regular-kde +plymouth; @: mixin/regular-kde +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