Merge tag 'v1.5.1' into sisyphus

conf.d/live.mk

@@ -11,7 +11,7 @@ distro/syslinux: distro/.boot \
 endif
 
 ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64,$(ARCH)))
-distro/grub: distro/.boot use/grub use/hdt +efi \
+distro/grub: distro/.boot use/grub use/hdt use/memtest +efi \
 	use/grub/localboot_bios.cfg use/grub/sdab_bios.cfg; @:
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
 	@$(call set,BOOTLOADER,grubpcboot)

conf.d/mixin.mk

@@ -92,7 +92,7 @@ mixin/regular-cinnamon: use/x11/cinnamon use/x11/lightdm/slick +nm-gtk \
 mixin/regular-deepin: use/x11/deepin use/browser/chromium +nm; @:
 
 mixin/regular-gnome3: use/x11/gnome3 use/fonts/ttf/redhat +nm-gtk
-	@$(call add,THE_PACKAGES,gnome3-regular xcalib templates)
+	@$(call add,THE_PACKAGES,xcalib templates)
 	@$(call add,THE_PACKAGES,chrome-gnome-shell)
 	@$(call add,THE_PACKAGES,qt5-wayland)
 

conf.d/regular.mk

@@ -23,7 +23,7 @@ distro/.regular-base: distro/.regular-bare use/vmguest use/memtest use/efi/dtb +
 distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
 	use/x11/wacom use/x11/amdgpu +wireless \
 	use/live/x11 use/live/repo \
-	use/live/suspend use/browser/firefox/live \
+	use/live/suspend use/browser/firefox \
 	use/syslinux/ui/gfxboot use/grub/ui/gfxboot
 	@$(call add,THE_BRANDING,bootloader)
 	@$(call add,THE_LISTS,$(call tags,(base || desktop) && regular))

features.in/efi/config.mk

@@ -73,7 +73,7 @@ endif
 # copy devicetree for default kernel on ESP partition
 use/efi/dtb: use/efi; @:
 ifeq (distro,$(IMAGE_CLASS))
-ifneq (,$(filter-out $(aarch64 riscv64),$(ARCH)))
+ifeq (,$(filter-out aarch64 riscv64,$(ARCH)))
 	@$(call set,GLOBAL_COPY_DTB,1)
 	@$(call add,EFI_FILES_REPLACE,dtb)
 endif

features.in/initrd-bootchain/config.mk

@@ -3,7 +3,7 @@ use/initrd-bootchain: use/uuid-iso
 	@$(call set,STAGE1_INITRD,initrd-bootchain)
 	@$(call set,STAGE1_PACKAGES,make-initrd-bootchain)
 	@$(call set,STAGE1_INITRD_TYPEARGS,$(shell echo "root=bootchain bootchain=fg,altboot automatic"))
-	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:cdrom,uuid:$(UUID_ISO)"))
+	@$(call set,STAGE1_INITRD_BOOTMETHOD,$(shell echo "method:disk,uuid:$(UUID_ISO)"))
 	@$(call set,STAGE1_INITRD_STAGE2_OPTION,stagename)
 	@$(call try,BOOTCHAIN_BC_FGVT_ACTIVATE,7)
 	@$(call try,BOOTCHAIN_WAITDEV_TIMEOUT,)

features.in/net-ssh/generate.mk

@@ -3,11 +3,11 @@ ifneq (,$(BUILDDIR))
 include $(BUILDDIR)/distcfg.mk
 
 # prepare the provided public SSH key to be carried over into the image
-all: SSH_DIR = $(BUILDDIR)/files/root/.ssh
+all: TMPDIR = $(BUILDDIR)/files/tmp
 all:
 	@if [ -s "$(SSH_KEY)" ]; then \
-		mkdir -pm0700 "$(SSH_DIR)"; \
-		install -pm0600 "$(SSH_KEY)" "$(SSH_DIR)/authorized_keys"; \
+		mkdir -p "$(TMPDIR)"; \
+		cp -v "$(SSH_KEY)" "$(TMPDIR)/root_ssh_key.pub"; \
 	fi
 
 endif

features.in/net-ssh/rootfs/image-scripts.d/51-root-ssh-key

+#!/bin/sh -efu
+
+TMPDIR=/tmp
+SSH_DIR=/root/.ssh
+
+if [ -e "$TMPDIR/root_ssh_key.pub" ]; then
+    mkdir -pm0700 "$SSH_DIR"
+    install -v -pm0600 "$TMPDIR/root_ssh_key.pub" "$SSH_DIR/authorized_keys"
+    rm -fv "$TMPDIR/root_ssh_key.pub"
+fi

features.in/net/README

 Эта фича конфигурирует базовую поддержку сети, включая нужную подсистему
 (etcnet, NetworkManager поверх etcnet или connman).
+
+Используйте TARGET_HOSTNAME для определения имени узла (файлы
+/etc/sysconfig/network и /etc/hostname).

features.in/net/config.mk

@@ -7,6 +7,7 @@ use/net: use/services use/pkgpriorities
 	@$(call add,THE_PACKAGES,iputils)
 	@$(call add,PINNED_PACKAGES,$$(THE_NET_SUBSYS))
 	@$(call set,THE_NET_SUBSYS,network-config-subsystem)
+	@$(call xport,TARGET_HOSTNAME)
 
 use/net/etcnet: use/net
 	@$(call set,THE_NET_SUBSYS,etcnet)

features.in/net/rootfs/image-scripts.d/50-net-hostname

+#!/bin/sh -efu
+#
+# Sets up the node's hostname.
+
+. shell-config
+
+if [ -n "${GLOBAL_TARGET_HOSTNAME:-}" ]; then
+	shell_config_set /etc/sysconfig/network 'TARGET_HOSTNAME' "$GLOBAL_TARGET_HOSTNAME"
+	echo "$GLOBAL_TARGET_HOSTNAME" >/etc/hostname
+fi

features.in/syslinux/config.mk

@@ -7,6 +7,7 @@ use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
 	@$(call try,BOOTVGA,normal)
 	@$(call add,SYSLINUX_FILES,/usr/lib/syslinux/pxelinux.0)
 	@$(call try,META_SYSTEM_ID,SYSLINUX)
+	@$(call try,SYSLINUX_UI,none)
 	@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
 	@$(call xport,SYSLINUX_DEFAULT)
 else

features.in/syslinux/generate.mk

@@ -16,11 +16,8 @@ STAGE1_INITRD_BOOTARGS := $(STAGE1_INITRD_TYPEARGS)=$(STAGE1_INITRD_BOOTMETHOD)
 
 # UI is backed by modules in modern syslinux
 # (except for built-in text prompt)
-ifneq (,$(SYSLINUX_UI))
+ifneq (none,$(SYSLINUX_UI))
 SYSLINUX_MODULES := $(SYSLINUX_MODULES) $(SYSLINUX_UI)
-else
-$(warning no syslinux ui configured, default is now none)
-SYSLINUX_UI := none
 endif
 
 ifeq (,$(SYSLINUX_DIRECT))

pkg.in/lists/server/php8.0

@@ -13,6 +13,7 @@ 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

pkg.in/lists/server/php8.1

@@ -13,6 +13,7 @@ php8.1-mbstring
 php8.1-mcrypt
 php8.1-memcached
 php8.1-mysqlnd
+php8.1-mysqlnd-mysqli
 php8.1-pdo
 php8.1-pdo_mysql
 php8.1-pdo_odbc

pkg.in/lists/tagged/desktop+gnustep

@@ -92,7 +92,7 @@ gnustep-PictureFrame
 gnustep-Pixen
 gnustep-PlopFolio
 gnustep-Poe
-gnustep-Popup
+#gnustep-Popup
 gnustep-Preview
 gnustep-PRICE
 #gnustep-projectcenter