Skip to content

M
mkimage-profiles
Commit 074962f3 authored by Roman Alifanov's avatar Roman Alifanov
Browse files
Options

ximper: refactoring

parent ee79bf32
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
conf.d/ximper.mk
View file @ 074962f3
...@@ -104,13 +104,13 @@ endif ...@@ -104,13 +104,13 @@ endif
endif endif
# base target (for most images) # base target (for most images)
distro/.ximper-base: distro/.ximper-bare \ distro/.ximper-minimal-env: distro/.ximper-bare \
use/isohybrid use/vmguest use/memtest \ use/isohybrid use/vmguest use/memtest \
use/efi/dtb +efi; @: use/efi/dtb +efi; @:
# graphical target (not enforcing xorg drivers or blobs) # graphical target (not enforcing xorg drivers or blobs)
distro/.ximper-x11: distro/.ximper-base mixin/ximper-x11 \ distro/.ximper-x11: distro/.ximper-minimal-env mixin/ximper-x11 \
use/x11/wacom use/x11/amdgpu +wireless \ use/x11/wacom use/x11/amdgpu +wireless \
use/live/x11 use/live/repo \ use/live/x11 use/live/repo \
use/live/suspend \ use/live/suspend \
...@@ -129,7 +129,7 @@ distro/.ximper-wm: distro/.ximper-x11 \ ...@@ -129,7 +129,7 @@ distro/.ximper-wm: distro/.ximper-x11 \
@$(call add,LIVE_PACKAGES,volumes-profile-kdesktop) @$(call add,LIVE_PACKAGES,volumes-profile-kdesktop)
distro/.ximper-install: distro/.ximper-base +installer \ distro/.ximper-install: distro/.ximper-minimal-env +installer \
use/branding use/bootloader/grub use/luks use/stage2/kms \ use/branding use/bootloader/grub use/luks use/stage2/kms \
use/install2/fs use/install2/vnc use/install2/repo use/install2/fs use/install2/vnc use/install2/repo
@$(call add,INSTALL2_PACKAGES,fdisk) @$(call add,INSTALL2_PACKAGES,fdisk)
...@@ -157,9 +157,8 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \ ...@@ -157,9 +157,8 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \
@$(call add,THE_PACKAGES,btrfs-progs) @$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd) @$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
distro/ximper: distro/.ximper-install-x11-systemd \ distro/ximper-base: distro/.ximper-install-x11-systemd \
distro/.ximper-wm \ distro/.ximper-wm \
mixin/ximper-gnome \
mixin/ximper-desktop-common-software \ mixin/ximper-desktop-common-software \
use/kernel/latest \ use/kernel/latest \
+plymouth; +plymouth;
...@@ -173,13 +172,19 @@ distro/ximper: distro/.ximper-install-x11-systemd \ ...@@ -173,13 +172,19 @@ distro/ximper: distro/.ximper-install-x11-systemd \
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done) @$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,gnome-flashback screenpen) @$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
distro/ximper-nvidia: distro/ximper use/x11/nvidia use/stage2/kms/nvidia mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
@$(call add,THE_PACKAGES,apt-scripts-nvidia) @$(call add,THE_PACKAGES,apt-scripts-nvidia)
@$(call add,BASE_PACKAGES,apt-scripts-nvidia) @$(call add,BASE_PACKAGES,apt-scripts-nvidia)
@$(call add,BASE_PACKAGES,nvidia-vaapi-driver) @$(call add,BASE_PACKAGES,nvidia-vaapi-driver)
@$(call add,EFI_BOOTARGS,nomodeset xdriver=fbdev) @$(call add,EFI_BOOTARGS,nomodeset xdriver=fbdev)
@$(call add,BASE_BOOTARGS,nvidia-drm.modeset=1) @$(call add,BASE_BOOTARGS,nvidia-drm.modeset=1)
distro/ximper-gnome: distro/ximper-base \
mixin/ximper-gnome
distro/ximper-gnome-nvidia: distro/ximper-gnome \
mixin/ximper-nvidia
endif endif
# Fonts mixins # Fonts mixins
......
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