Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
a002944d
Commit
a002944d
authored
Feb 08, 2024
by
Roman Alifanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migration to live-installer-pkg (without cleaning)
parent
9192a083
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
16 deletions
+13
-16
ximper.mk
conf.d/ximper.mk
+13
-16
No files found.
conf.d/ximper.mk
View file @
a002944d
...
@@ -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 \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment