Merge branch 'main' into fix_slow_image_creation

config/boards/firefly-rk3399.csc

@@ -1,29 +1,11 @@
 # Rockchip RK3399 hexa core 4GB SoC eMMC GBE USB3 WiFi
 BOARD_NAME="Firefly RK3399"
-BOARDFAMILY="media"
-BOARD_MAINTAINER="150balbes"
+BOARDFAMILY="rockchip64"
+BOARD_MAINTAINER=""
 BOOTCONFIG="firefly-rk3399_defconfig"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge"
 FULL_DESKTOP="yes"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="rockchip/rk3399-firefly.dtb"
 SRC_EXTLINUX="yes"
 SRC_CMDLINE="console=ttyS2,1500000 console=tty0"
-#ASOUND_STATE="asound.state.station-p1"
-
-function post_family_tweaks_bsp__firefly-rk3399_BSP() {
-    display_alert "Installing BSP firmware and fixups"
-
-	if [[ $BRANCH == legacy ]]; then
-
-		# Bluetooth for most of others (custom patchram is needed only in legacy)
-		install -m 755 $SRC/packages/bsp/rk3399/brcm_patchram_plus_rk3399 $destination/usr/bin
-		cp $SRC/packages/bsp/rk3399/rk3399-bluetooth.service $destination/lib/systemd/system/
-
-		# need to swap chips in the service
-		sed -i s%BCM4345C5%BCM4356A2%g $destination/lib/systemd/system/rk3399-bluetooth.service
-
-	fi
-
-	return 0
-}

lib/functions/rootfs/distro-agnostic.sh

@@ -413,6 +413,11 @@ function install_distribution_agnostic() {
 	# @TODO: rpardini: still needed? people might want working Samba
 	disable_systemd_service_sdcard nmbd
 
+	# move sshd activation from ssh.service to ssh.socket (more realiable, avoids possible race condition on first boot) supplementary to ffee50a8a6b99bb4f35af90895e019eced7ff71b and 67250321918e59582b8f1003d331f4b1db253b21
+	display_alert "Moving SSH activation from service to socket" "systemd" "info"
+	disable_systemd_service_sdcard ssh
+	chroot_sdcard systemctl enable ssh.socket
+
 	# disable low-level kernel messages for non betas
 	if [[ -z $BETA ]]; then
 		sed -i "s/^#kernel.printk*/kernel.printk/" "${SDCARD}"/etc/sysctl.conf

packages/bsp/common/usr/lib/armbian/armbian-firstlogin

@@ -579,7 +579,7 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
 	# re-enable passing locale environment via ssh
 	sed -e '/^#AcceptEnv LANG/ s/^#//' -i /etc/ssh/sshd_config
 	# restart sshd daemon
-	systemctl reload ssh.service
+	systemctl restart ssh.service
 
 	# rpardini: hacks per-dm, very much legacy stuff that works by a miracle
 	if [[ "${desktop_dm}" == "lightdm" ]] && [ -n "$RealName" ]; then