Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 5aebb0d5 authored by Roman Alifanov's avatar Roman Alifanov
Browse files
Options

migration to live-installer-pkg (without cleaning)

parent f7a5ec2b
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 16 deletions
conf.d/ximper.mk
View file @ 5aebb0d5
...@@ -75,7 +75,7 @@ mixin/ximper-x11: use/luks \ ...@@ -75,7 +75,7 @@ mixin/ximper-x11: use/luks \
@$(call add,THE_PACKAGES,btrfs-progs) @$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,THE_PACKAGES,gpm) @$(call add,THE_PACKAGES,gpm)
@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop) @$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
@$(call add,INSTALL2_PACKAGES,volumes-profile-kdesktop) @$(call add,LIVE_PACKAGES,volumes-profile-kdesktop)
@$(call set,INSTALL2_FONTS,fonts-otf-abattis-cantarell) @$(call set,INSTALL2_FONTS,fonts-otf-abattis-cantarell)
...@@ -130,35 +130,33 @@ distro/.ximper-wm: distro/.ximper-x11 \ ...@@ -130,35 +130,33 @@ distro/.ximper-wm: distro/.ximper-x11 \
use/live/rw use/live/ru use/live/rw use/live/ru
@$(call set,INSTALLER,alt-workstation) @$(call set,INSTALLER,alt-workstation)
distro/.ximper-install: distro/.ximper-minimal-env +installer \ distro/.ximper-install: distro/.ximper-minimal-env +live-installer-pkg \
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 @$(call add,LIVE_PACKAGES,fdisk)
@$(call add,INSTALL2_PACKAGES,fdisk)
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,LIVE_PACKAGES,xorg-conf-synaptics)
endif endif
@$(call add,THE_LISTS,$(call tags,base ximper)) @$(call add,THE_LISTS,$(call tags,base ximper))
@$(call add,INSTALL2_BRANDING,alterator notes) @$(call add,LIVE_PACKAGES,btrfs-progs)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,THE_BRANDING,alterator) @$(call add,THE_BRANDING,alterator)
distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \ distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \
use/install2/suspend mixin/ximper-desktop mixin/ximper-x11 \ mixin/ximper-desktop mixin/ximper-x11 \
use/branding/complete use/branding/slideshow/once mixin/desktop-installer \ use/branding/complete use/branding/slideshow/once mixin/desktop-installer \
use/install2/fs use/efi/shell use/l10n/default/ru_RU use/efi/shell use/l10n/default/ru_RU
@$(call set,INSTALLER,alt-workstation) @$(call set,INSTALLER,alt-workstation)
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch) @$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 +systemd +systemd-optimal
use/x11/lightdm/gtk +systemd +systemd-optimal
@$(call add,THE_PACKAGES,bluez) @$(call add,THE_PACKAGES,bluez)
@$(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-base: distro/.ximper-install-x11-systemd \ distro/ximper-base: distro/.ximper-install-x11-systemd \
distro/.ximper-wm \ use/live/rw use/live/ru use/live/x11 use/live/repo \
use/live/suspend \
mixin/ximper-desktop-common-software \ mixin/ximper-desktop-common-software \
use/kernel/latest \ use/kernel/latest \
+plymouth; +plymouth;
...@@ -181,9 +179,8 @@ distro/ximper-base: distro/.ximper-install-x11-systemd \ ...@@ -181,9 +179,8 @@ distro/ximper-base: distro/.ximper-install-x11-systemd \
mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia mixin/ximper-nvidia: use/x11/nvidia use/stage2/kms/nvidia
@$(call add,EFI_BOOTARGS,xdriver=vesa initcall_blacklist=simpledrm_platform_driver_init) @$(call add,EFI_BOOTARGS,xdriver=vesa initcall_blacklist=simpledrm_platform_driver_init)
@$(call add,BASE_BOOTARGS,nvidia-drm.modeset=1) @$(call add,BASE_BOOTARGS,nvidia-drm.modeset=1)
@$(call add,INSTALL2_PACKAGES,installer-feature-remove-xorgconf) @$(call add,LIVE_PACKAGES,installer-feature-remove-xorgconf)
@$(call add,INSTALL2_PACKAGES,apt-scripts-nvidia) @$(call add,LIVE_PACKAGES,apt-scripts-nvidia)
@$(call add,INSTALL2_CLEANUP_PACKAGES,xorg-dri-nouveau xorg-drv-nouveau)
@$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*') @$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*')
@$(call add,BASE_PACKAGES,apt-scripts-nvidia) @$(call add,BASE_PACKAGES,apt-scripts-nvidia)
@$(call add,BASE_PACKAGES,nvidia-modprobe nvidia-settings libglut libGLU nvidia-vaapi-driver vulkan-tools \ @$(call add,BASE_PACKAGES,nvidia-modprobe nvidia-settings libglut libGLU nvidia-vaapi-driver vulkan-tools \
......
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