Commit 82c5ac7a authored by Roman Alifanov's avatar Roman Alifanov

Merge branch 'merge-toxblh-home' into 'sisyphus'

Added the ability to build with nvidia drivers. + Small refactoring See merge request ximper/mkimage-profiles!1
parents 8e79cfa3 3875b1b7
Ximper Readme
├── distro/ximper-nvidia/
│ └── @nvidia driver pack
└── distro/ximper/
├── distro/.ximper-install-x11-systemd/
│ └── distro/.ximper-install-x11/
│ ├── distro/.ximper-install/
│ │ └── distro/.ximper-base/
│ │ └── distro/.ximper-bare/
│ │ └── distro/.base
│ ├── mixin/ximper-desktop
│ └── mixin/ximper-x11
├── distro/.ximper-wm/
│ ├── distro/.ximper-x11/
│ │ ├── distro/.ximper-base/
│ │ │ └── distro/.ximper-bare/
│ │ │ └── distro/.base
│ │ └── mixin/ximper-x11
│ └── mixin/ximper-desktop
├── mixin/ximper-desktop-common-software
└── mixin/ximper-gnome
Сборка
make DISTRO_VERSION=0.8.2 APTCONF=/path/to/apt-confs/apt.conf.sisyphus ximper.iso
\ No newline at end of file
ifeq (distro,$(IMAGE_CLASS))
mixin/ximper-desktop-commom-software:
@$(call add,THE_PACKAGES,appinstall gnome-software\
\
extension-manager\
\
blackbox-terminal\
\
notification-daemon\
\
gvfs-backend-dnssd avahi-daemon gvfs-backend-smb\
\
gvfs-backend-mtp\
\
gnome-tweaks\
\
nano\
\
orca\
\
cups-pk-helper\
\
system-monitoring-center\
\
file-roller\
\
)
# Basic applications and User selection lists
# Lists - pkg.in/lists/etersoft/*
# Groups - pkg.in/groups/etersoft/*
mixin/ximper-desktop-common-software:
@$(call add,THE_LISTS,etersoft/_base-apps)
@$(call add,THE_LISTS,etersoft/gnome-ssh-agent)
@$(call add,MAIN_GROUPS,\
\
etersoft/gnome-a11y\
etersoft/00_gnome-settings\
\
slinux/flatpak etersoft/99_timeshift\
......@@ -98,16 +79,15 @@ mixin/ximper-x11: use/luks \
@$(call set,INSTALL2_FONTS,fonts-otf-abattis-cantarell)
mixin/ximper-gnome: use/x11/gnome use/fonts/ttf/redhat +nm-gtk
@$(call add,THE_PACKAGES,xcalib templates)
@$(call add,THE_PACKAGES,chrome-gnome-shell)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
@$(call add,THE_PACKAGES,nautilus-open-any-terminal sushi gnome-epub-thumbnailer gnome-text-editor gnome-initial-setup gnome-tour gnome-font-viewer\
alacarte gnome-power-manager switcheroo-control power-profiles-daemon gnome-bluetooth3.0)
@$(call add,SERVICES_ENABLE,switcheroo-control.service)
ifeq (sisyphus,$(BRANCH))
@$(call add,THE_PACKAGES,gnome-packagekit)
endif
mixin/ximper-gnome: use/x11/xorg \
use/x11/gdm \
use/fonts/ttf/redhat \
use/fonts/ttf/google-noto \
+nm-gtk \
+pipewire
@$(call add,THE_LISTS,etersoft/_gnome-base) # pkg.in/lists/etersoft/_gnome-base
@$(call add,SERVICES_ENABLE,switcheroo-control.service) # Service to check dual-GPU. Q: Maybe to post script if present?
@$(call add,IM_PACKAGES,imsettings-gsettings)
distro/.ximper-bare: distro/.base use/kernel/net use/docs/license \
......@@ -125,7 +105,9 @@ endif
endif
# base target (for most images)
distro/.ximper-base: distro/.ximper-bare use/isohybrid use/vmguest use/memtest use/efi/dtb +efi; @:
distro/.ximper-base: distro/.ximper-bare \
use/isohybrid use/vmguest use/memtest \
use/efi/dtb +efi; @:
# graphical target (not enforcing xorg drivers or blobs)
......@@ -163,7 +145,8 @@ endif
distro/.ximper-install-x11: distro/.ximper-install +vmguest +wireless \
use/install2/suspend mixin/ximper-desktop mixin/ximper-x11 \
use/branding/complete use/branding/slideshow/once mixin/desktop-installer use/install2/fs use/efi/shell use/l10n/default/ru_RU use/rescue/base
use/branding/complete use/branding/slideshow/once mixin/desktop-installer \
use/install2/fs use/efi/shell use/l10n/default/ru_RU use/rescue/base
@$(call set,INSTALLER,alt-workstation)
@$(call add,RESCUE_LISTS,$(call tags,rescue misc))
@$(call add,MAIN_PACKAGES,anacron man-whatis usb-modeswitch)
......@@ -175,9 +158,12 @@ distro/.ximper-install-x11-systemd: distro/.ximper-install-x11 \
@$(call add,THE_PACKAGES,btrfs-progs)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
distro/ximper: distro/.ximper-install-x11-systemd distro/.ximper-wm mixin/ximper-gnome mixin/ximper-desktop-commom-software\
use/kernel/latest +plymouth; @:
distro/ximper: distro/.ximper-install-x11-systemd \
distro/.ximper-wm \
mixin/ximper-gnome \
mixin/ximper-desktop-common-software \
use/kernel/latest \
+plymouth;
@$(call set,META_VOL_ID,Ximper Linux $(DISTRO_VERSION) $(ARCH))
@$(call set,META_APP_ID,Ximper Linux $(DISTRO_VERSION) $(ARCH) $(shell date +%F))
@$(call set,BRANDING,etersoft-ximper)
......@@ -187,6 +173,22 @@ distro/ximper: distro/.ximper-install-x11-systemd distro/.ximper-wm mixin/ximper
@$(call add,THE_KMODULES,virtualbox)
@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
endif
\ No newline at end of file
distro/ximper-nvidia: distro/ximper use/x11/nvidia use/stage2/kms/nvidia
@$(call add,THE_PACKAGES,apt-scripts-nvidia)
@$(call add,BASE_PACKAGES,apt-scripts-nvidia)
@$(call add,BASE_PACKAGES,nvidia-vaapi-driver)
@$(call add,EFI_BOOTARGS,nomodeset xdriver=fbdev)
endif
# Fonts mixins
use/fonts/ttf/google-noto: use/fonts
@$(call add,FONTS,fonts-ttf-google-noto-sans)
@$(call add,FONTS,fonts-ttf-google-noto-serif)
@$(call add,FONTS,fonts-ttf-google-noto-sans-mono)
@$(call add,FONTS,fonts-ttf-google-noto-sans-symbols)
@$(call add,FONTS,fonts-ttf-google-noto-sans-symbols2)
@$(call add,FONTS,fonts-ttf-google-noto-emoji)
@$(call add,FONTS,fonts-ttf-google-noto-emoji-color)
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=Gnome Accessability
Name[ru_RU]=Gnome Accessability
X-Alterator-PackageList=etersoft/gnome-a11y
X-Alterator-Required=no
Categories=GNOME
# Private list base apps
# GUI frontend for epm play.
appinstall
blackbox-terminal
# Local network service discovery MacOS
avahi-daemon
# Text editor
nano
# Printer use PolicyKit
cups-pk-helper
# Windows like system monitor
system-monitoring-center
# Our case saved from initial list
switcheroo-control
xcalib
templates
qt5-wayland
qt6-wayland
alacarte
# Base gnome apps
chrome-gnome-shell
gnome-super-minimal
nautilus-open-any-terminal
sushi
gnome-epub-thumbnailer
gnome-text-editor
gnome-initial-setup
gnome-tour
gnome-font-viewer
gnome-power-manager
power-profiles-daemon
gnome-bluetooth3.0
# ALT bug 42028
tracker3
gnome-packagekit
# Gnome additionals
gnome-software
notification-daemon
gnome-tweaks
extension-manager
# Archive manager
file-roller
# Extentions GVFS
gvfs-backend-dnssd
gvfs-backend-smb
gvfs-backend-mtp
# Gnome screen reader (a11y)
orca
accerciser
\ No newline at end of file
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