Skip to content

M
mkimage-profiles
Commit 6a0d7a51 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

Merge tag 'v1.5.14' into sisyphus

v1.5.14 - image.in/Makefile: fix show out image size - distro.mk: fix VOL_SET when is empty (fixed typo) - x11, mixim.mk: replace pulseaudio with pipewire - x11: enable dm.service as a fallback and other improvements - regular-vm.mk: increaze size vm image (desktops to 8 GiB, jeos to 4 GiB) - deflogin: add missing groups (video, camera, cdrom, floppy)
parents f670b9bd 9c89b206
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 34 deletions
conf.d/mixin.mk
View file @ 6a0d7a51
......@@ -97,7 +97,6 @@ mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm
@$(call add,THE_PACKAGES,gnome-terminal)
@$(call add,THE_PACKAGES,gnome-software)
@$(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)
@$(call add,THE_PACKAGES,cups-pk-helper cups)
......@@ -106,10 +105,10 @@ mixin/regular-gnome: use/x11/gnome use/fonts/ttf/redhat +nm
mixin/regular-kde5: use/x11/kde5 use/browser/falkon \
use/x11/kde5-display-manager-lightdm \
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
+pulse
use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg
@$(call add,THE_PACKAGES,plasma5-xdg-desktop-portal-kde)
@$(call add,THE_PACKAGES,qt6-wayland)
@$(call add,THE_PACKAGES,plasma5-discover)
ifneq (,$(filter-out e2k% riscv64 loongarch64,$(ARCH)))
@$(call add,THE_PACKAGES,falkon-kde5)
endif
......@@ -122,7 +121,7 @@ mixin/xfce-base: use/x11/xfce +nm-gtk \
@$(call add,THE_PACKAGES,xdg-user-dirs-gtk)
@$(call add,THE_PACKAGES,xkill)
mixin/regular-xfce: mixin/xfce-base use/domain-client +pulse
mixin/regular-xfce: mixin/xfce-base use/domain-client +pipewire
@$(call add,THE_PACKAGES,pavucontrol xscreensaver-frontend)
@$(call add,THE_PACKAGES,xfce4-pulseaudio-plugin xfce-polkit)
......
conf.d/phone.mk
View file @ 6a0d7a51
......@@ -8,7 +8,8 @@ endif
mixin/phone-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
use/deflogin/root use/l10n/ru_RU use/xdg-user-dirs
use/deflogin/root use/l10n/ru_RU use/xdg-user-dirs \
use/drm
@$(call add,THE_BRANDING,notes indexhtml)
@$(call add,THE_LISTS,mobile/base)
@$(call add,THE_PACKAGES,polkit-rule-mobile)
......@@ -19,7 +20,7 @@ mixin/phone-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
@$(call add,CONTROL,fusermount:public)
@$(call add,CONTROL,libnss-role:disabled)
mixin/phosh: use/services +pulse +nm +nm-native
mixin/phosh: use/services +nm +nm-native
@$(call add,THE_LISTS,mobile/phosh)
@$(call add,DEFAULT_SERVICES_ENABLE,phosh)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
......@@ -31,7 +32,7 @@ vm/.phosh: vm/systemd mixin/phone-base mixin/phosh +systemd \
@$(call add,THE_LISTS,mobile/apps)
vm/phosh: vm/.phosh use/tty/S0 use/uboot use/phone/ttyescape +efi \
use/firmware +plymouth
use/firmware +plymouth +pipewire
@$(call set,KFLAVOURS,un-def)
ifeq (aarch64,$(ARCH))
@$(call set,VM_PARTTABLE,msdos)
......@@ -42,7 +43,7 @@ endif
ifeq (aarch64,$(ARCH))
# TODO: devicetree ($root)/boot/dtb/rockchip/rk3399-pinephone-pro.dtb
mixin/pinephone: use/firmware use/bootloader/uboot use/tty/S2 \
use/phone/ttyescape
use/phone/ttyescape +pulse
@$(call set,EFI_BOOTLOADER,)
@$(call set,UBOOT_TIMEOUT,5)
@$(call set,KFLAVOURS,pine)
......
conf.d/regular-vm.mk
View file @ 6a0d7a51
......@@ -68,7 +68,7 @@ vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \
@$(call add,THE_PACKAGES,bluez)
@$(call add,THE_PACKAGES,glmark2 glmark2-es2)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call try,VM_SIZE,6442450944)
@$(call try,VM_SIZE,8589934592)
vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
use/init/sysv/polkit +power; @:
......@@ -82,7 +82,7 @@ vm/regular-jeos-systemd: vm/systemd \
mixin/regular-vm-jeos mixin/vm-archdep
@$(call add,THE_PACKAGES,glibc-locales)
@$(call add,THE_PACKAGES,systemd-settings-disable-kill-user-processes)
@$(call try,VM_SIZE,3221225472)
@$(call try,VM_SIZE,4294967296)
vm/regular-jeos-sysv: vm/bare mixin/regular-vm-jeos mixin/vm-archdep +power; @:
......@@ -96,8 +96,7 @@ vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep-x11
vm/regular-deepin: vm/.regular-gtk mixin/regular-deepin mixin/vm-archdep-x11; @:
vm/regular-gnome: vm/.regular-gtk mixin/regular-gnome mixin/vm-archdep-x11
@$(call set,VM_SIZE,8589934592)
vm/regular-gnome: vm/.regular-gtk mixin/regular-gnome mixin/vm-archdep-x11; @:
vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep-x11; @:
......@@ -111,8 +110,7 @@ ifeq (,$(filter-out mipsel riscv64,$(ARCH)))
@$(call add,THE_PACKAGES,xfce-reduced-resource)
endif
vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep-x11
@$(call set,VM_SIZE,7516192768)
vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep-x11; @:
vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep-x11; @:
......
features.in/deflogin/config.mk
View file @ 6a0d7a51
......@@ -38,11 +38,11 @@ use/deflogin/altroot: use/deflogin/root use/deflogin/xgrp
# peripherals
use/deflogin/hardware: use/deflogin
@$(call add,GROUPS,cdwriter radio scanner uucp)
@$(call add,GROUPS,cdwriter cdrom floppy radio scanner uucp)
# videocard and desktop related hardware
use/deflogin/xgrp: use/deflogin
@$(call add,GROUPS,xgrp audio)
@$(call add,GROUPS,xgrp audio video camera)
# potentially elevated privileges (NB: _not_ wheel)
use/deflogin/privileges: use/deflogin
......
features.in/phone/rootfs/files/etc/dconf/db/local.d/10_power deleted 100644 → 0
View file @ f670b9bd
[org/gnome/settings-daemon/plugins/power]
sleep-inactive-battery-timeout=60
features.in/services/rootfs/image-scripts.d/10-services
View file @ 6a0d7a51
......@@ -51,7 +51,7 @@ for i in $GLOBAL_SYSTEMD_SERVICES_MASK; do switch $i mask; done
for i in $GLOBAL_SYSTEMD_SERVICES_UNMASK; do switch $i unmask; done
## systemd-logind services
SYSTEMD_USER='--user --global'
SYSTEMD_USER='--global'
# defaults
for i in $GLOBAL_DEFAULT_SYSTEMD_USER_SERVICES_ENABLE; do switch $i on; done
......
features.in/x11/config.mk
View file @ 6a0d7a51
......@@ -106,6 +106,7 @@ use/x11/wacom: use/x11
## display managers
use/x11/dm: use/x11-autostart use/pkgpriorities
@$(call try,THE_DISPLAY_MANAGER,xdm)
@$(call try,THE_DM_SERVICE,dm)
@$(call add,THE_PACKAGES,$$(THE_DISPLAY_MANAGER))
@$(call add,PINNED_PACKAGES,$$(THE_DISPLAY_MANAGER))
@$(call add,DEFAULT_SERVICES_ENABLE,$$(THE_DM_SERVICE))
......@@ -116,8 +117,7 @@ use/x11/lightdm/gtk use/x11/lightdm/slick use/x11/lightdm/kde\
@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)
@$(call set,THE_DM_SERVICE,lightdm)
use/x11/lxdm use/x11/gdm2.20 use/x11/sddm \
use/x11/kde5-display-manager-sddm: \
use/x11/gdm2.20: \
use/x11/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,$*)
......@@ -125,9 +125,8 @@ use/x11/kde5-display-manager-lightdm: \
use/x11/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,$*)
@$(call set,THE_DM_SERVICE,lightdm)
@$(call add,PINNED_PACKAGES,kde5-display-manager-sddm:Extra)
use/x11/gdm: \
use/x11/gdm use/x11/sddm use/x11/lxdm: \
use/x11/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,$*)
@$(call set,THE_DM_SERVICE,$*)
......@@ -150,14 +149,14 @@ use/x11/xfce: use/x11
@$(call add,THE_PACKAGES,xfce4-minimal xfce4-default)
@$(call add,IM_PACKAGES,imsettings-xfce)
use/x11/xfce/full: use/x11/xfce +pulse
use/x11/xfce/full: use/x11/xfce +pipewire
@$(call add,THE_PACKAGES,xfce4-full)
use/x11/cinnamon: use/x11/xorg +pulse
use/x11/cinnamon: use/x11/xorg +pipewire
@$(call add,THE_LISTS,$(call tags,cinnamon desktop))
@$(call add,IM_PACKAGES,imsettings-cinnamon)
use/x11/deepin: use/x11/xorg +pulse
use/x11/deepin: use/x11/xorg +pipewire
@$(call add,THE_LISTS,$(call tags,deepin desktop))
use/x11/gnome: use/x11/xorg use/x11/gdm +pipewire
......@@ -165,14 +164,14 @@ use/x11/gnome: use/x11/xorg use/x11/gdm +pipewire
@$(call add,THE_PACKAGES,tracker3) # ALT bug 42028
@$(call add,IM_PACKAGES,imsettings-gsettings)
use/x11/enlightenment: use/x11 use/net/connman use/power/acpi +pulse
use/x11/enlightenment: use/x11 use/net/connman use/power/acpi +pipewire
@$(call add,THE_LISTS,$(call tags,enlightenment desktop))
use/x11/lxde: use/x11
@$(call add,THE_LISTS,$(call tags,lxde desktop))
@$(call add,IM_PACKAGES,imsettings-lxde)
use/x11/lxqt: use/x11 +pulse
use/x11/lxqt: use/x11 +pipewire
@$(call add,THE_LISTS,$(call tags,desktop && lxqt))
@$(call add,IM_PACKAGES,imsettings-qt)
......@@ -185,7 +184,7 @@ use/x11/wmaker: use/x11
use/x11/gnustep: use/x11
@$(call add,THE_LISTS,$(call tags,gnustep desktop))
use/x11/mate: use/x11 +pulse
use/x11/mate: use/x11 +pipewire
@$(call add,THE_LISTS,$(call tags,mate desktop))
@$(call add,IM_PACKAGES,imsettings-mate)
......@@ -195,8 +194,10 @@ use/x11/dwm: use/x11
use/x11/leechcraft: use/x11
@$(call add,THE_PACKAGES,leechcraft)
use/x11/kde5: use/x11/xorg use/x11/kde/synaptic
use/x11/kde5: use/x11/xorg +pipewire
@$(call add,THE_PACKAGES,kde5)
@$(call add,THE_PACKAGES,kde5-volume-control-4-pipewire)
@$(call add,PINNED_PACKAGES,kde5-volume-control-4-pipewire)
## screensavers
use/x11/xscreensaver:
......
features.in/xdg-user-dirs/config.mk
View file @ 6a0d7a51
......@@ -2,6 +2,7 @@ use/xdg-user-dirs: use/control
@$(call add_feature)
@$(call add,CONTROL,xdg-user-dirs:enabled)
@$(call add,THE_PACKAGES,xdg-user-dirs)
@$(call add,DEFAULT_SYSTEMD_USER_SERVICES_ENABLE,xdg-user-dirs)
@$(call xport,XDG_USER_DIRS)
# tweak some values to move these dirs into Documents/
......
image.in/Makefile
View file @ 6a0d7a51
......@@ -90,7 +90,7 @@ imagedir:
@mkdir -p "$(IMAGE_OUTDIR)"
postprocess: | $(addprefix postprocess-,$(sort $(POSTPROCESS_TARGETS)))
@OUTSIZE="`ls -hs "$(IMAGE_OUTPATH)" | cut -f1 -d' '`"; \
@OUTSIZE="`ls -lh "$(IMAGE_OUTPATH)" | tr -s " " | cut -f5 -d' '`"; \
if [ ! -n "$$OUTSIZE" ]; then \
echo "** error: $(IMAGE_OUTPATH) missing" >&2; \
exit 1; \
......
lib/distro.mk
View file @ 6a0d7a51
......@@ -19,7 +19,7 @@ else
@$(call try,IMAGE_FLAVOUR,$(subst alt-$(BRANCH)-,,$(IMAGE_NAME)))
@$(call try,META_VOL_ID,ALT $(BRANCH) $$(IMAGE_FLAVOUR)/$(ARCH))
endif
@$(call try,META_VOL_try,ALT)
@$(call try,META_VOL_SET,ALT)
# NB: the last flavour in KFLAVOURS gets to be the default one;
# the kernel packages regexp evaluation has to take place at build stage
......
pkg.in/lists/mobile/apps
View file @ 6a0d7a51
......@@ -15,8 +15,10 @@ geary
# multimedia
megapixels
snapshot
cheese
mpv
totem
clapper
amberol
lollypop
shortwave
......@@ -45,6 +47,7 @@ gnome-calculator
gnome-clocks
gnome-calendar
gnome-characters
gnome-compass
gnome-maps
gnome-weather
grim
......
pkg.in/lists/mobile/phosh
View file @ 6a0d7a51
......@@ -12,12 +12,18 @@ bluez
# base applications
gnome-control-center
phosh-mobile-settings
alt-tweaks
gnome-software
# extra applications
phosh-antispam
# file manager
nautilus
portfolio
tracker3
templates
# screen recording for wlroots-based compositors
wf-recorder
# base libraries
at-spi2-core
......
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