Merge branch 'main' into igorpecovnik-patch-1

CONTRIBUTING.md

@@ -18,9 +18,27 @@ Please be sure to review the [Development Code Review Procedures and Guidelines]
 
 ## PR and issues labeling
 
-Labels are defined in [.github/labels.yml](.github/labels.yml) YAML file. They are automatically recreated upon change.
+Labels are defined in [.github/labels.yml](.github/labels.yml) YAML file. They are automatically recreated upon change. Require at least Triage users permission on repository. [Request access](https://github.com/armbian/build#contact).
+
+Most of labels are self explanoritary but here are short instructions on how to use them:
+
+Automated on PR:
+- size/small, size/medium, size/large is determined automatically depending on the PR size
+- desktop, hardware, software is determined automatically depending on location of the changes
+
+Manual on PR:
+- milestone - determine into which release we should PR go
+- work in progress - when you are still working on
+- needs review - when you are done and seeking for attention
+- ready to merge - when you are done
+- help needed - when you are desperate and can't move on
+
+Labelling Issues:
+- bug when its clear its our bug, "not our bug" if its clear its not ours, duplicate if it exists already
+- discussion, when that is needed, user error when we know its a problem on the other side
+- "can be closed" for stalled issues
+
 
-* Require at least Triage users permission on repository. [Request access](https://github.com/armbian/build#contact)
 
 ## Contributing
 

config/boards/orangepizero.csc → config/boards/orangepizero.conf

@@ -1,7 +1,7 @@
 # Allwinner H2+ quad core 256/512MB RAM SoC WiFi SPI
 BOARD_NAME="Orange Pi Zero"
 BOARDFAMILY="sun8i"
-BOARD_MAINTAINER=""
+BOARD_MAINTAINER="viraniac"
 BOOTCONFIG="orangepi_zero_defconfig"
 MODULES_CURRENT="g_serial"
 MODULES_BLACKLIST="sunxi_cedrus"

config/kernel/linux-thead-legacy.config

@@ -2270,7 +2270,7 @@ CONFIG_SENSORS_MR75203=y
 # CONFIG_SENSORS_NPCM7XX is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SENSORS_PWM_FAN=y
 # CONFIG_SENSORS_SHT15 is not set
 # CONFIG_SENSORS_SHT21 is not set
 # CONFIG_SENSORS_SHT3x is not set

lib/functions/bsp/armbian-bsp-cli-deb.sh

@@ -103,7 +103,12 @@ function compile_armbian-bsp-cli() {
 		INITRD_ARCH=$INITRD_ARCH
 		KERNEL_IMAGE_TYPE=$KERNEL_IMAGE_TYPE
 		FORCE_BOOTSCRIPT_UPDATE=$FORCE_BOOTSCRIPT_UPDATE
-		VENDOR=$VENDOR
+		VENDOR="$VENDOR"
+		VENDORDOCS="$VENDORDOCS"
+		VENDORURL="$VENDORURL"
+		VENDORSUPPORT="$VENDORSUPPORT"
+		VENDORBUGS="$VENDORBUGS"
+
 	EOF
 
 	# copy general overlay from packages/bsp-cli

lib/functions/configuration/main-config.sh

@@ -38,16 +38,25 @@ function do_main_configuration() {
 		exit_with_error "REVISION must begin with a digit, got '${REVISION}'"
 	fi
 
-	[[ -z $VENDOR ]] && VENDOR="Armbian"
-	[[ -z $VENDORURL ]] && VENDORURL="https://www.armbian.com"
-	[[ -z $VENDORSUPPORT ]] && VENDORSUPPORT="https://forum.armbian.com"
-	[[ -z $VENDORPRIVACY ]] && VENDORPRIVACY="https://www.armbian.com"
-	[[ -z $VENDORBUGS ]] && VENDORBUGS="https://www.armbian.com/bugs"
+	# Armbian image is set as unofficial if build manually or without declaring from outside
+	[[ -z $VENDOR ]] && VENDOR="Armbian-unofficial"
+
+	# Use framework defaults for community Armbian images and unsupported distribution when building Armbian distribution
+	if [[ ${VENDOR} == "Armbian" ]] && [[ ${BOARD_TYPE} != "conf" || $(cat $SRC/config/distributions/$RELEASE/support) != "supported" ]]; then
+		VENDORURL="https://www.armbian.com/"
+		unset VENDORSUPPORT,VENDORPRIVACY,VENDORBUGS,VENDORLOGO,ROOTPWD,MAINTAINER,MAINTAINERMAIL
+	fi
+
+	[[ -z $VENDORURL ]] && VENDORURL="https://duckduckgo.com/"
+	[[ -z $VENDORSUPPORT ]] && VENDORSUPPORT="https://community.armbian.com/"
+	[[ -z $VENDORPRIVACY ]] && VENDORPRIVACY="https://duckduckgo.com/"
+	[[ -z $VENDORBUGS ]] && VENDORBUGS="https://armbian.atlassian.net/"
+	[[ -z $VENDORDOCS ]] && VENDORDOCS="https://docs.armbian.com/"
 	[[ -z $VENDORLOGO ]] && VENDORLOGO="armbian-logo"
-	[[ -z $ROOTPWD ]] && ROOTPWD="1234"                                  # Must be changed @first login
-	[[ -z $MAINTAINER ]] && MAINTAINER="Igor Pecovnik"                   # deb signature
-	[[ -z $MAINTAINERMAIL ]] && MAINTAINERMAIL="igor.pecovnik@****l.com" # deb signature
-	DEST_LANG="${DEST_LANG:-"en_US.UTF-8"}"                              # en_US.UTF-8 is default locale for target
+	[[ -z $ROOTPWD ]] && ROOTPWD="1234"                                        # Must be changed @first login
+	[[ -z $MAINTAINER ]] && MAINTAINER="John Doe"                              # deb signature
+	[[ -z $MAINTAINERMAIL ]] && MAINTAINERMAIL="[email protected]"  # deb signature
+	DEST_LANG="${DEST_LANG:-"en_US.UTF-8"}"                                    # en_US.UTF-8 is default locale for target
 	display_alert "DEST_LANG..." "DEST_LANG: ${DEST_LANG}" "debug"
 
 	declare -g SKIP_EXTERNAL_TOOLCHAINS="${SKIP_EXTERNAL_TOOLCHAINS:-yes}" # don't use any external toolchains, by default.

lib/functions/image/fingerprint.sh

@@ -13,28 +13,30 @@
 #--------------------------------------------------------------------------------------------------------------------------------
 function fingerprint_image() {
 	cat <<- EOF > "${1}"
-		--------------------------------------------------------------------------------
-		Title:          ${VENDOR} $REVISION ${BOARD^} $BRANCH
-		Kernel:         Linux ${IMAGE_INSTALLED_KERNEL_VERSION}
+		---------------------------------------------------------------------------
+		Generated with Armbian(tm) build framework https://github.com/armbian/build
+		---------------------------------------------------------------------------
+		Vendor:         ${VENDOR}
+		Revision:       $REVISION
+		Board:          ${BOARD^}
+		Kernel:         Linux ${IMAGE_INSTALLED_KERNEL_VERSION} ($BRANCH)
 		Build date:     $(date +'%d.%m.%Y')
-		Builder rev:    ${BUILD_REPOSITORY_COMMIT}
-		Maintainer:     $MAINTAINER <$MAINTAINERMAIL>
+		Sources:        ${BUILD_REPOSITORY_URL}
+		Sources rev:    ${BUILD_REPOSITORY_COMMIT}
 		Authors:        https://www.armbian.com/authors
-		Sources:        https://github.com/armbian/
-		Support:        https://forum.armbian.com/
-		Changelog:      https://www.armbian.com/logbook/
-		Documentation:  https://docs.armbian.com/
+		Maintainer:     ${MAINTAINER} <$MAINTAINERMAIL>
+		Support:        ${VENDORSUPPORT}
 	EOF
 
 	if [ -n "$2" ]; then
 		cat <<- EOF >> "${1}"
-			--------------------------------------------------------------------------------
+			---------------------------------------------------------------------------
 			Partitioning configuration: $IMAGE_PARTITION_TABLE offset: $OFFSET
 			Boot partition type: ${BOOTFS_TYPE:-(none)} ${BOOTSIZE:+"(${BOOTSIZE} MB)"}
 			Root partition type: $ROOTFS_TYPE ${FIXED_IMAGE_SIZE:+"(${FIXED_IMAGE_SIZE} MB)"}
 
 			CPU configuration: $CPUMIN - $CPUMAX with $GOVERNOR
-			--------------------------------------------------------------------------------
+			---------------------------------------------------------------------------
 			Verify GPG signature:
 			gpg --verify $2.img.xz.asc
 
@@ -50,8 +52,7 @@ function fingerprint_image() {
 	fi
 
 	cat <<- EOF >> "${1}"
-		--------------------------------------------------------------------------------
+		---------------------------------------------------------------------------
 		$(cat "${SRC}"/LICENSE)
-		--------------------------------------------------------------------------------
 	EOF
 }

packages/bsp/common/etc/update-motd.d/10-armbian-header

@@ -33,7 +33,7 @@ KERNELID=$(uname -r)
 [[ -f /proc/device-tree/model ]] && [[ -n $(tr -d '\000' < /proc/device-tree/model | grep ODROID | grep Plus) ]] && BOARD_NAME+="+"
 
 TERM=linux toilet -f standard -F metal $(echo $BOARD_NAME | sed 's/Orange Pi/OPi/' | sed 's/NanoPi/NPi/' | sed 's/Banana Pi/BPi/')
-echo -e "Welcome to \e[0;91mArmbian ${VERSION} ${DISTRIBUTION_CODENAME^}\x1B[0m with $([[ $BRANCH == edge ]] && echo -e "\e[0;91mbleeding\x1B[0m edge " )\e[0;91mLinux $KERNELID\x1B[0m\n"
+echo -e "Welcome to \e[0;91m${VENDOR} ${VERSION} ${DISTRIBUTION_CODENAME^}\x1B[0m with $([[ $BRANCH == edge ]] && echo -e "\e[0;91mbleeding\x1B[0m edge " )\e[0;91mLinux $KERNELID\x1B[0m\n"
 
 # displaying status warnings
 

packages/bsp/common/usr/bin/armbianmonitor

@@ -894,7 +894,10 @@ CollectSupportInfo() {
 	lspci >/dev/null 2>&1 && (echo -e "\n### lspci:\n" ; lspci ${VERBOSE} 2>/dev/null)
 	nvme >/dev/null 2>&1 && (echo -e "\n### nvme:\n" ; nvme list 2>/dev/null)
 	[ -z $SUDO_USER ] || echo -e "\n### Group membership of $(groups $SUDO_USER)"
-	echo -e "\n### Userland:\n\n$(grep PRETTY_NAME /etc/os-release)"
+	echo -en "\n### Userland"
+	[[ -f /etc/armbian-release ]] && echo -en " generated with Armbian Build Framework"
+	echo -en ":\n"
+	echo -e "\n$(grep PRETTY_NAME /etc/os-release)"
 	echo -e "\n### Installed packages:\n\n$(dpkg -l | grep -E "openmediavault|armbian| linux-")"
 	KernelVersion=$(awk -F" " '{print $3}' < /proc/version)
 	case ${KernelVersion} in

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

@@ -346,8 +346,8 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
 
 	clear
 
-	echo -e "Welcome to \e[1m\e[97mARMBIAN\x1B[0m! \n"
-	echo -e "Documentation: \e[1m\e[92mhttps://docs.armbian.com\x1B[0m | Community: \e[1m\e[92mhttps://forum.armbian.com\x1B[0m\n"
+	echo -e "Welcome to \e[1m\e[97m${VENDOR}\x1B[0m! \n"
+	echo -e "Documentation: \e[1m\e[92m${VENDORDOCS}\x1B[0m | Community support: \e[1m\e[92m${VENDORSUPPORT}\x1B[0m\n"
 	GET_IP=$(bash /etc/update-motd.d/30-armbian-sysinfo | grep IP | sed "s/.*IP://" | sed 's/^[ \t]*//')
 	[[ -n "$GET_IP" ]] && echo -e "IP address: $GET_IP\n"
 
@@ -431,6 +431,11 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then
 		printf "\nYou selected \e[0;91mZSH\x1B[0m as your default shell. If you want to use it right away, please logout and login! \n\n"
 	fi
 
+	# re-enable passing locale environment via ssh
+	sed -e '/^#AcceptEnv LANG/ s/^#//' -i /etc/ssh/sshd_config
+	# restart sshd daemon
+	systemctl reload ssh.service
+
 	# rpardini: hacks per-dm, very much legacy stuff that works by a miracle
 	if [[ "${desktop_dm}" == "lightdm" ]] && [ -n "$RealName" ]; then
 

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

@@ -52,6 +52,9 @@ case "$1" in
 	# add unique installation id to the image release file
 	sed '1s/^/IMAGE_UUID=/' /proc/sys/kernel/random/uuid >> /etc/armbian-image-release
 
+	# disable passing locale environment via ssh
+	sed -e '/AcceptEnv LANG/ s/^#*/#/' -i /etc/ssh/sshd_config
+
 	# SSH Keys creation
 	rm -f /etc/ssh/ssh_host*
 	read entropy_before </proc/sys/kernel/random/entropy_avail