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
0
Issues
0
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
Anton Palgunov
mkimage-profiles
Commits
9afd8863
Commit
9afd8863
authored
Sep 07, 2023
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into sisyphus
parents
2fc163fb
f17666c9
Show whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
42 additions
and
47 deletions
+42
-47
kworkstation.mk
conf.d/kworkstation.mk
+7
-1
mixin-alt-server.mk
conf.d/mixin-alt-server.mk
+1
-0
mixin.mk
conf.d/mixin.mk
+3
-0
phone.mk
conf.d/phone.mk
+1
-1
regular-vm.mk
conf.d/regular-vm.mk
+4
-0
regular.mk
conf.d/regular.mk
+7
-1
config.mk
features.in/alternatives/config.mk
+3
-0
config.mk
features.in/e2k/config.mk
+1
-0
config.mk
features.in/efi/config.mk
+1
-1
config.mk
features.in/server/config.mk
+0
-1
mate.directory
pkg.in/groups/centaurus/mate.directory
+1
-1
z02-add-additional.directory
pkg.in/groups/kworkstation/z02-add-additional.directory
+2
-2
php8.0.directory
pkg.in/groups/server/php8.0.directory
+0
-8
base-server
pkg.in/lists/centaurus/base-server
+0
-1
emulators
pkg.in/lists/centaurus/emulators
+2
-1
freeipa-client
pkg.in/lists/centaurus/freeipa-client
+0
-1
freeipa-server
pkg.in/lists/centaurus/freeipa-server
+0
-1
add-webterminal
pkg.in/lists/kworkstation/add-webterminal
+0
-1
disk-install
pkg.in/lists/kworkstation/disk-install
+2
-0
kde5
pkg.in/lists/kworkstation/kde5
+0
-1
kde5-base
pkg.in/lists/kworkstation/kde5-base
+2
-0
phosh
pkg.in/lists/mobile/phosh
+2
-0
php8.0
pkg.in/lists/server/php8.0
+0
-25
xfce-sysv
pkg.in/lists/xfce-sysv
+3
-0
No files found.
conf.d/kworkstation.mk
View file @
9afd8863
...
...
@@ -19,7 +19,7 @@ mixin/kworkstation-common-deps: \
use/l10n/default/ru_RU \
use/control use/services \
use/x11/intel use/x11/radeon use/x11/amdgpu use/x11/nvidia \
use/x11/
sd
dm use/x11/wacom \
use/x11/
kde5-display-manager-light
dm use/x11/wacom \
use/memtest \
use/init/systemd \
use/cleanup/live-no-cleanupdb \
...
...
@@ -95,9 +95,13 @@ endif
@$(call add,SERVICES_DISABLE,openl2tp)
@$(call add,SERVICES_DISABLE,slapd)
@$(call add,SERVICES_ENABLE,snapd.socket)
@$(call add,SERVICES_ENABLE,power-profiles-daemon.service)
@$(call add,CLEANUP_BASE_PACKAGES,'libwbclient-sssd')
@$(call add,CLEANUP_PACKAGES,'^kernel-modules-drm-nouveau.*')
@$(call add,CLEANUP_PACKAGES,'xterm')
@$(call add,CLEANUP_LIVE_PACKAGES,'xterm')
@$(call add,CLEANUP_PACKAGES,'udev-rule-generator-net')
@$(call add,CLEANUP_LIVE_PACKAGES,'livecd-main-repo')
@$(call set,META_VOL_SET,ALT)
@$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_ID,ALT Workstation K $(DISTRO_VERSION)$(STATUS))
...
...
@@ -117,6 +121,7 @@ mixin/kworkstation-install-opts:
@$(call add,STAGE1_MODLISTS,stage2-ntfs)
@$(call add,STAGE2_KMODULES,drm-nouveau)
@$(call add,THE_PACKAGES,installer-feature-nfs-client-stage3)
@$(call add,BASE_PACKAGES,plasma5-welcome)
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,INSTALL2_PACKAGES,installer-feature-samba-usershares-kde-stage2)
...
...
@@ -136,6 +141,7 @@ mixin/kworkstation-install-opts:
@$(call add,INSTALL2_PACKAGES,installer-feature-xprofile-clear)
@$(call add,INSTALL2_PACKAGES,installer-feature-systemd-oomd)
@$(call add,INSTALL2_PACKAGES,installer-feature-webterminal-setup)
@$(call add,INSTALL2_PACKAGES,installer-feature-remove-xorgconf)
@$(call add,INSTALL2_PACKAGES,apt-scripts-nvidia)
@$(call add,INSTALL2_PACKAGES,volumes-profile-kdesktop)
@$(call add,INSTALL2_PACKAGES,udev-rules-ioschedulers)
...
...
conf.d/mixin-alt-server.mk
View file @
9afd8863
...
...
@@ -13,6 +13,7 @@ mixin/alt-server: server_main_kmodules = bcmwl ch34x dm-secdel drbd9 drm-ancient
virtualbox-addition-video virtualbox xtables-addons
mixin/alt-server: +installer +systemd \
use/ntp/chrony \
use/branding/notes \
use/control use/services \
use/install2/stage3 \
...
...
conf.d/mixin.mk
View file @
9afd8863
...
...
@@ -89,10 +89,13 @@ mixin/regular-gnustep: use/x11/gnustep use/mediacheck
mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \
use/fonts/ttf/google use/im
@$(call add,THE_PACKAGES,xdg-user-dirs-gtk)
@$(call add,THE_PACKAGES,gnome-disk-utility gnome-system-monitor)
mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm
@$(call add,THE_PACKAGES,gnome-terminal)
@$(call add,PINNED_PACKAGES,gnome-terminal:Required)
@$(call add,THE_PACKAGES,templates)
@$(call add,THE_PACKAGES,chrome-gnome-shell)
@$(call add,THE_PACKAGES,qt5-wayland qt6-wayland)
...
...
conf.d/phone.mk
View file @
9afd8863
...
...
@@ -26,7 +26,7 @@ mixin/phosh: use/services +pulse +nm +nm-native
ifeq (vm,$(IMAGE_CLASS))
vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
mixin/waydroid
mixin/waydroid
use/fonts/ttf/google
@$(call add,THE_LISTS,mobile/apps)
vm/phosh: vm/.phosh use/tty/S0 use/uboot use/phone +efi \
...
...
conf.d/regular-vm.mk
View file @
9afd8863
...
...
@@ -15,8 +15,12 @@ mixin/vm-archdep:: use/auto-resize; @:
ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
mixin/vm-archdep:: +efi
ifeq (,$(filter-out p10,$(BRANCH)))
@$(call set,KFLAVOURS,un-def)
else
@$(call set,KFLAVOURS,std-def un-def)
endif
endif
ifeq (,$(filter-out armh,$(ARCH)))
mixin/vm-archdep::
...
...
conf.d/regular.mk
View file @
9afd8863
...
...
@@ -15,6 +15,11 @@ distro/.regular-bare: distro/.base use/kernel/net use/docs/license \
# base target (for most images)
distro/.regular-base: distro/.regular-bare use/vmguest use/memtest \
use/efi/shell use/efi/dtb +efi; @:
ifeq (,$(filter-out p10,$(BRANCH)))
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
@$(call set,KFLAVOURS,un-def)
endif
endif
# graphical target (not enforcing xorg drivers or blobs)
distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
...
...
@@ -167,7 +172,8 @@ endif
distro/regular-xfce-install: distro/.regular-install-x11-systemd \
mixin/regular-xfce; @:
distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv; @:
distro/regular-xfce-sysv: distro/.regular-gtk-sysv mixin/regular-xfce-sysv
@$(call set,KFLAVOURS,std-def)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call set,BOOTLOADER,isolinux)
endif
...
...
features.in/alternatives/config.mk
View file @
9afd8863
...
...
@@ -4,3 +4,6 @@ use/alternatives:
use/alternatives/xvt/%: use/alternatives
@$(call add,ALTERNATIVES,/usr/bin/xvt:/usr/bin/$*)
use/alternatives/x-terminal-emulator/%: use/alternatives
@$(call add,ALTERNATIVES,/usr/bin/x-terminal-emulator:/usr/bin/$*)
features.in/e2k/config.mk
View file @
9afd8863
...
...
@@ -8,6 +8,7 @@ use/e2k: use/tty/S0 use/l10n/default/ru_RU
@$(call add,STAGE2_PACKAGES,agetty)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-xorg-conf-stage2)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-fix-boot-stage2)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-sensors-stage2)
@$(call add,INSTALL2_PACKAGES,installer-feature-fstrim-stage2)
@$(call add,INSTALL2_PACKAGES,blacklist-ide) # avoid overwriting hda
@$(call add,INSTALL2_PACKAGES,ifplugd) # for net-eth link status
...
...
features.in/efi/config.mk
View file @
9afd8863
...
...
@@ -35,7 +35,7 @@ use/efi/signed: use/efi
@$(call add,COMMON_PACKAGES,shim-signed)
@$(call add,COMMON_PACKAGES,mokutil pesign)
@$(call add,RESCUE_PACKAGES,openssl)
ifeq (,$(filter-out p10 c10f
1
,$(BRANCH)))
ifeq (,$(filter-out p10 c10f
%
,$(BRANCH)))
@$(call add,STAGE1_PACKAGES,shim-signed-installer-kludge grub-efi alt-uefi-certs dosfstools mtools)
endif
...
...
features.in/server/config.mk
View file @
9afd8863
...
...
@@ -51,7 +51,6 @@ use/server/groups/services: use/server
@$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail)
@$(call add,MAIN_GROUPS,server/apache2 server/nginx)
@$(call add,MAIN_GROUPS,server/mariadb server/pgsql)
@$(call add,MAIN_GROUPS,server/php8.0)
@$(call add,MAIN_GROUPS,server/php8.1)
@$(call add,MAIN_GROUPS,server/ftp server/rsync)
@$(call add,MAIN_GROUPS,server/kvm)
...
...
pkg.in/groups/centaurus/mate.directory
View file @
9afd8863
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=
GNOM
E desktop enviroment
Name=
MAT
E desktop enviroment
X-Alterator-PackageList=centaurus/mate
X-Alterator-Parent=centaurus/80-desktop
X-Alterator-Depends=systemd centaurus/xorg
...
...
pkg.in/groups/kworkstation/z02-add-additional.directory
View file @
9afd8863
...
...
@@ -6,5 +6,5 @@ Categories=KDE;
Name=Additional (attention)
Name[ru_RU]=Дополнительно (внимание)
Comment=Additional options for special use.
Comment[ru_RU]=Дополнительные опции для специального использования.
Comment=A
ttention! A
dditional options for special use.
Comment[ru_RU]=
Внимание!
Дополнительные опции для специального использования.
pkg.in/groups/server/php8.0.directory
deleted
100644 → 0
View file @
2fc163fb
[Desktop Entry]
Encoding=UTF-8
Type=Directory
Name=PHP 8.0 support
X-Alterator-PackageList=server/php8.0
X-Alterator-Required=no
Name[ru_RU]=Поддержка PHP 8.0
Categories=Server;Networking
pkg.in/lists/centaurus/base-server
View file @
9afd8863
...
...
@@ -70,7 +70,6 @@ openssh-server
openssh-blacklist
postfix
postfix-tls
openntpd
irqbalance
cgroup
...
...
pkg.in/lists/centaurus/emulators
View file @
9afd8863
...
...
@@ -3,7 +3,8 @@ firefox-esr@!aarch64
firefox-esr-ru@!aarch64
wine@X86
wine-mono@X86
#wine-mono@X86
wine-mono-8.0.0@X86
wine-gecko@X86
i586-wine@x86_64
...
...
pkg.in/lists/centaurus/freeipa-client
View file @
9afd8863
openntpd
task-auth-freeipa
freeipa-client
certmonger
...
...
pkg.in/lists/centaurus/freeipa-server
View file @
9afd8863
freeipa-server-trust-ad
freeipa-server-dns
openntpd
freeipa-client
libsss_sudo
pkg.in/lists/kworkstation/add-webterminal
View file @
9afd8863
alterator-kiosk
chromium-gost
webterminal-session
sddm-theme-breeze
pkg.in/lists/kworkstation/disk-install
View file @
9afd8863
...
...
@@ -78,3 +78,5 @@ x2goclient
x2goserver x2goserver-printing cups-x2go
x2gobroker x2gobroker-ssh x2gobroker-daemon x2gobroker-authservice
openuds-client openuds-actor
usbip usbip-server
yandex-browser-stable
pkg.in/lists/kworkstation/kde5
View file @
9afd8863
...
...
@@ -91,7 +91,6 @@ kde5-ktorrent
#eiskaltdcpp-qt
#kde5-kio-gdrive
plasma5-welcome
plasma5-desktop-maxi
plasma5-kinfocenter-maxi
kde5@META
...
...
pkg.in/lists/kworkstation/kde5-base
View file @
9afd8863
...
...
@@ -90,6 +90,7 @@ pcmciautils
pinfo
pm-utils
polkit-rule-admin-root
power-profiles-daemon
pulseaudio-bluez
quota
rpminstall
...
...
@@ -120,6 +121,7 @@ xinput
xfsprogs
xorg-conf-synaptics
xorg-conf-libinput-touchpad
xsetup
libva-driver-intel@X86
libva-intel-media-driver@x86_64
...
...
pkg.in/lists/mobile/phosh
View file @
9afd8863
...
...
@@ -5,6 +5,8 @@ xdg-desktop-portal-gnome
xorg-xwayland
qt5-wayland
qt6-wayland
qt6-svg
qt6-imageformats
bluez
# base applications
...
...
pkg.in/lists/server/php8.0
deleted
100644 → 0
View file @
2fc163fb
apache2-mod_php8.0
php8.0
php8.0-curl
php8.0-dba
php8.0-dom
php8.0-exif
php8.0-fileinfo
php8.0-fpm-fcgi
php8.0-gd2
php8.0-imap
php8.0-ldap
php8.0-mbstring
php8.0-mcrypt
php8.0-memcached
php8.0-mysqlnd
php8.0-mysqlnd-mysqli
php8.0-pdo
php8.0-pdo_mysql
php8.0-pdo_odbc
php8.0-pdo_pgsql
php8.0-pdo_sqlite
php8.0-pgsql
php8.0-xmlrpc
php8.0-xsl
php8.0-zip
pkg.in/lists/xfce-sysv
View file @
9afd8863
...
...
@@ -29,3 +29,6 @@ firmware-alsa-sof
edid-decode
mediainfo
mpv
xinput
trafshow
7-zip
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