Merge branch 'next' into sisyphus

conf.d/education.mk

@@ -12,7 +12,6 @@ mixin/education: \
 	use/x11/lightdm/gtk +pulse \
 	+nm use/x11/gtk/nm \
 	use/xdg-user-dirs/deep \
-	use/office/LibreOffice/full \
 	use/browser/chromium
 	@$(call set,BRANDING,alt-education)
 	@$(call add,THE_BRANDING,indexhtml)
@@ -102,7 +101,7 @@ mixin/education-base: \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
 	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
 	@$(call set,INSTALLER,education)
-	@$(call set,META_VOL_ID,ALT Education 10.1 $(ARCH))
+	@$(call set,META_VOL_ID,ALT Education 10.2 $(ARCH))
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_VOL_SET,ALT)
@@ -124,7 +123,7 @@ mixin/education-lite-base: \
 	use/stage2/mmc use/stage2/net use/stage2/net-nfs use/stage2/cifs \
 	use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb
 	@$(call set,INSTALLER,education)
-	@$(call set,META_VOL_ID,ALT Education 10.1 $(ARCH))
+	@$(call set,META_VOL_ID,ALT Education 10.2 $(ARCH))
 	@$(call set,META_PUBLISHER,BaseALT Ltd)
 	@$(call set,META_APP_ID,$(DISTRO_VERSION) $(ARCH))
 	@$(call set,META_VOL_SET,ALT)
@@ -143,6 +142,7 @@ mixin/education-installer: \
 	@$(call add,INSTALL2_PACKAGES,disable-usb-autosuspend)
 	@$(call add,INSTALL2_PACKAGES,btrfs-progs)
 	@$(call add,MAIN_GROUPS,education/00_base)
+	@$(call add,MAIN_GROUPS,education/00_libreoffice)
 	@$(call add,MAIN_GROUPS,education/01_preschool)
 	@$(call add,MAIN_GROUPS,education/02_gradeschool)
 	@$(call add,MAIN_GROUPS,education/03_highschool)
@@ -150,6 +150,7 @@ mixin/education-installer: \
 	@$(call add,MAIN_GROUPS,education/05_university)
 	@$(call add,MAIN_GROUPS,education/07_teacher)
 	@$(call add,MAIN_GROUPS,education/08_server-apps-edu)
+	@$(call add,MAIN_GROUPS,education/10_robotics)
 	@$(call add,BASE_PACKAGES,os-prober)
 	@$(call add,BASE_PACKAGES,guest-account)
 	@$(call add,MAIN_PACKAGES,iperf3)

conf.d/live.mk

@@ -25,7 +25,7 @@ endif
 distro/grub-net-install: distro/.base +efi \
 	use/firmware use/grub/sdab_bios.cfg use/l10n \
 	use/stage2/net-install use/stage2/hid use/stage2/usb \
-	use/stage2/ata use/stage2/sbc
+	use/stage2/ata use/stage2/sbc use/stage2/kms
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)
 endif

conf.d/mixin.mk

@@ -93,6 +93,7 @@ mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm \
 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,power-profiles-daemon)
 	@$(call add,THE_PACKAGES,gnome-terminal)
 	@$(call add,PINNED_PACKAGES,gnome-terminal:Required)
 	@$(call add,THE_PACKAGES,templates)

features.in/branding/install2/lib/50branding.mk

-IMAGE_PACKAGES_REGEXP += $(call branding, \
+IMAGE_PACKAGES_REGEXP += $(call branding, release \
 				$(STAGE2_BRANDING) $(INSTALL2_BRANDING))

features.in/branding/lib/20-branding.mk

 # step 4: build the distribution image
 
-DOT_BASE += $(call branding,$(THE_BRANDING))
+DOT_BASE += $(call branding,release $(THE_BRANDING))

features.in/branding/live/lib/50branding.mk

-IMAGE_PACKAGES_REGEXP += $(call branding, \
+IMAGE_PACKAGES_REGEXP += $(call branding, release \
 				$(THE_BRANDING) $(STAGE2_BRANDING))

features.in/branding/main/lib/50branding.mk

-IMAGE_PACKAGES_REGEXP += $(call branding,$(THE_BRANDING))
+IMAGE_PACKAGES_REGEXP += $(call branding,release $(THE_BRANDING))

features.in/branding/stage1/lib/50branding.mk

-CHROOT_PACKAGES_REGEXP += $(call branding,$(STAGE1_BRANDING))
+CHROOT_PACKAGES_REGEXP += $(call branding,release $(STAGE1_BRANDING))

features.in/grub/config.mk

@@ -13,7 +13,7 @@ endif
 
 # UI is overwritten
 use/grub/ui/%: use/grub
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+ifeq (,$(filter-out i586 x86_64 aarch64 loongarch64,$(ARCH)))
 	@$(call set,GRUB_UI,$*)
 	@if [ "$*" == gfxboot ]; then \
 		$(call add,STAGE1_BRANDING,bootloader); \

features.in/initrd-propagator/config.mk

@@ -5,3 +5,4 @@ use/initrd-propagator:
 	@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "changedisk automatic"))
 	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:cdrom,fuid:$(UUID_ISO)"))
 	@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)
+	@$(call add,STAGE2_BOOTARGS,udev.log_level=err)

features.in/pkgpriorities/main/lib/50-pkgpriorities.mk → features.in/pkgpriorities/main/lib/50-pkgpriorities-main.mk

-_IMAGE_APTBOX_ = $(WORKDIR)/aptbox
+_MAIN_APTBOX_ = $(WORKDIR)/pkgbox/aptbox
 
 # Add prerequisite to the copy-packages target of
 # $(MKIMAGE_PREFIX)/targets.mk.
-copy-packages: $(_IMAGE_APTBOX_)/etc/apt/pkgpriorities
+copy-packages: $(_MAIN_APTBOX_)/etc/apt/pkgpriorities
 
 _PINNED_PACKAGES_ = $(foreach pp,$(PINNED_PACKAGES),$(if $(findstring :,$(pp)),$(pp),$(pp):$(PIN_PRIORITY)))
 _PIN_PRIORITIES_ = $(sort $(foreach pp,$(_PINNED_PACKAGES_),$(lastword $(subst :, ,$(pp)))))
 _PKGPRIORITIES_ = $(subst \n ,\n,$(foreach pri,$(_PIN_PRIORITIES_),$(pri):$(patsubst %:$(pri),\n   %,$(filter %:$(pri),$(_PINNED_PACKAGES_)))\n))
 
-$(_IMAGE_APTBOX_)/etc/apt/pkgpriorities: prepare-workdir
+$(_MAIN_APTBOX_)/etc/apt/pkgpriorities: prepare-workdir
 	@echo -e '$(_PKGPRIORITIES_)' | sed -e 's,[[:space:]]\+$$,,' >$@
 	@if [ -s $@ ]; then \
 		if grep -q '^\(APT::\)\?Dir::Etc::pkgpriorities[[:space:]]' \
-			$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+			$(_MAIN_APTBOX_)/etc/apt/apt.conf; \
 		then \
 			sed -i -e 's,\(Dir::Etc::pkgpriorities\)[[:space:]].*$$,\1 "$@";,g' \
-				$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+				$(_MAIN_APTBOX_)/etc/apt/apt.conf; \
 		else \
 			echo 'Dir::Etc::pkgpriorities "$@";' \
-				>>$(_IMAGE_APTBOX_)/etc/apt/apt.conf; \
+				>>$(_MAIN_APTBOX_)/etc/apt/apt.conf; \
 		fi; \
 		echo "--- Package priorities ---" >&2; \
 		cat $@ >&2; \

features.in/x11/config.mk

@@ -25,6 +25,10 @@ ifeq (,$(filter-out riscv64,$(ARCH)))
 use/x11/xorg:: use/x11/amdgpu; @:
 endif
 
+ifeq (,$(filter-out loongarch64,$(ARCH)))
+use/x11/xorg:: use/x11/radeon use/x11/amdgpu; @:
+endif
+
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 use/x11/intel: use/x11 use/drm
 	@$(call add,THE_PACKAGES,xorg-drv-intel)

lib/build.mk

@@ -95,7 +95,7 @@ build-image: profile/populate
 		tail -n $(MAX_LINES) "$(BUILDLOG)" $(SHORTEN) \
 		| if [ -z "$(QUIET)" ]; then \
 			echo "$(TIME) done $$DURATION"; \
-			GREP_COLOR="$(ANSI_OK)" \
+			GREP_COLORS="mt=0$(ANSI_OK)" \
 			  grep --color=auto '^\*\* image: .*$$' ||:; \
 		else \
 			echo -n "$(TIME) $$DURATION "; \
@@ -114,7 +114,7 @@ build-image: profile/populate
 			echo "$(TIME) (you might want to rerun with DEBUG=1)"; \
 		fi; \
 		tail -n $(MAX_LINES) "$(BUILDLOG)" \
-		| GREP_COLOR="$(ANSI_FAIL)" \
+		| GREP_COLORS="mt=0$(ANSI_FAIL)" \
 		  grep -E --color=auto -m "$(MAX_ERRORS)" "$(GOTCHA)"; \
 		df -P $(BUILDDIR) | awk 'END { if ($$4 < $(LOWSPACE)) \
 			{ print "NB: low space on "$$6" ("$$5" used)"}}'; \

pkg.in/groups/education/00_libreoffice.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=LibreOffice Office Suite
+X-Alterator-PackageList=education/libreoffice
+Name[ru_RU]=Офисный пакет LibreOffice
+X-Alterator-Required=yes

pkg.in/groups/education/10_robotics.directory

+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Robotics
+X-Alterator-PackageList=education/robotics
+X-Alterator-Required=no
+Name[ru_RU]=Робототехника

pkg.in/lists/centaurus/base

 installer-feature-online-repo@!E2K
-installer-feature-repo-add@!E2K
 make-initrd-multipath
 lsof
 man-pages

pkg.in/lists/education/kdesc

@@ -33,6 +33,5 @@ kde5-edu
 kde5-printing
 kde5-scanning
 kde5-connect
-LibreOffice-still-kde5@!E2K
 nextcloud-client-kde5@!E2K
 branding-alt-education-kde-settings

pkg.in/lists/education/libreoffice

+LibreOffice-still@META
+LibreOffice-still-gtk3
+LibreOffice-still-langpack-be
+LibreOffice-still-langpack-kk
+LibreOffice-still-langpack-ru
+LibreOffice-still-langpack-uk

pkg.in/lists/education/misc

@@ -92,6 +92,7 @@ adp
 settime-rfc867
 x11spice@x86_64
 x11spice@aarch64
+freerdp-server
 pam_pkcs11
 gvfs-shares
 shared-desktop-icons
@@ -160,6 +161,7 @@ system-config-printer-udev
 xkill
 eiciel
 polkit-rule-udisks2-mount
+userpasswd
 
 # Package managenment
 synaptic
@@ -167,6 +169,7 @@ synaptic-usermode
 gnome-software
 gnome-software-disable-updates
 packagekit
+polkit-rule-packagekit-allow-remove
 rpminstall
 appinstall
 

pkg.in/lists/education/robotics

+gz-sim
+arduino

pkg.in/lists/mobile/base

@@ -66,3 +66,5 @@ polkit
 udev-rules-rfkill-uaccess
 
 xdg-user-dirs
+
+android-tools