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
5c7932e2
Commit
5c7932e2
authored
Oct 07, 2023
by
Roman Alifanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ximper: refactoring
parent
bc7053d4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
ximper.mk
conf.d/ximper.mk
+11
-6
No files found.
conf.d/ximper.mk
View file @
5c7932e2
...
@@ -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
...
...
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