Merge remote-tracking branch 'armbian/main'

Merge our patches with latest upstream Armbian build

.github/workflows/scorecard.yml

@@ -52,7 +52,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif

config/boards/bigtreetech-cb1.conf

@@ -11,9 +11,3 @@ BOOTFS_TYPE="fat"
 BOOT_FS_LABEL="BOOT"
 OVERLAY_PREFIX="sun50i-h616"
 BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb"
-
-post_family_config__fdt_bigtreetech_cb1() {
-	if [[ "${BRANCH}" = "edge" ]]; then
-		BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-pi.dtb"
-	fi
-}

config/boards/thinkpad-x13s.wip

@@ -21,22 +21,23 @@ declare -g BOOT_LOGO=desktop
 # This board boots via EFI/Grub, but requires a DTB to be passed, from Grub, to the Kernel.
 declare -g GRUB_CMDLINE_LINUX_DEFAULT="clk_ignore_unused pd_ignore_unused arm64.nopauth efi=noruntime" # iommu.passthrough=0 iommu.strict=0 pcie_aspm.policy=powersupersave
 declare -g BOOT_FDT_FILE="qcom/sc8280xp-lenovo-thinkpad-x13s.dtb"
-declare -g UEFI_MOUNT_POINT_SKIP_FSTAB="yes" # If we leave the /boot/efi in fstab, systemd hangs waiting for it. @TODO why?
-enable_extension "grub-with-dtb"             # important, puts the whole DTB handling in place.
+# declare -g UEFI_MOUNT_POINT_SKIP_FSTAB="yes" # If we leave the /boot/efi in fstab, systemd hangs waiting for it; FIXED: by adding mtools pkg
+
+enable_extension "grub-with-dtb" # important, puts the whole DTB handling in place.
 
 # Use the full firmware, complete linux-firmware plus Armbian's
 declare -g BOARD_FIRMWARE_INSTALL="-full"
 
 function post_family_config_branch_sc8280xp__jhovolds_69y_kernel() {
-	declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel.
-	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.10'
+	declare -g KERNEL_MAJOR_MINOR="6.11" # Major and minor versions of this kernel.
+	declare -g KERNELBRANCH='branch:wip/sc8280xp-6.11-rc5'
 	declare -g KERNELSOURCE='https://github.com/jhovold/linux.git'
 	declare -g LINUXCONFIG="linux-${ARCH}-${BRANCH}" # for this board: linux-arm64-sc8280xp
 	display_alert "Set up jhovold's kernel ${KERNELBRANCH} for" "${BOARD}" "info"
 }
 
 function x13s_is_userspace_supported() {
-	[[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "mantic" || "${RELEASE}" == "noble" ]] && return 0
+	[[ "${RELEASE}" == "trixie" || "${RELEASE}" == "sid" || "${RELEASE}" == "noble" || "${RELEASE}" == "oracular" ]] && return 0
 	return 1
 }
 
@@ -56,13 +57,9 @@ function post_family_config__debian_now_has_userspace_for_the_x13s() {
 	add_packages_to_image "alsa-ucm-conf"            # for audio; see https://packages.ubuntu.com/alsa-ucm-conf and https://packages.debian.org/alsa-ucm-conf - we need 1.2.10 + patches, see below
 	add_packages_to_image "acpi"                     # general ACPI support
 	add_packages_to_image "zstd"                     # for zstd compression of initrd
-
-	## Trixie, as of 2023-10-13, is missing fprintd and libpam-fprintd; see https://tracker.debian.org/pkg/fprintd and https://tracker.debian.org/pkg/libpam-fprintd
-	## rpardini: checked on 2024-07-07 and they're back!
-	#if [[ "${RELEASE}" != "trixie" ]]; then
-	#	add_packages_to_image "fprintd"        # for fingerprint reader; see https://packages.ubuntu.com/fprintd and https://packages.debian.org/fprintd
-	#	add_packages_to_image "libpam-fprintd" # for fingerprint reader PAM support; see https://packages.ubuntu.com/libpam-fprintd and https://packages.debian.org/libpam-fprintd
-	#fi
+	add_packages_to_image "mtools"                   # for access to the EFI partition
+	add_packages_to_image "fprintd"                  # for fingerprint reader; see https://packages.ubuntu.com/fprintd and https://packages.debian.org/fprintd
+	add_packages_to_image "libpam-fprintd"           # for fingerprint reader PAM support; see https://packages.ubuntu.com/libpam-fprintd and https://packages.debian.org/libpam-fprintd
 
 	# Also needed, not listed here:
 	# - mesa > 23.1.5; see https://packages.ubuntu.com/mesa-vulkan-drivers and https://packages.debian.org/mesa-vulkan-drivers
@@ -80,9 +77,15 @@ function pre_customize_image__x13s_debian_ucm_hack_via_patch() {
 		return 0
 	fi
 
+	# No longer needed for Trixie, as of 2024-08-29, Trixie already has 1.2.12 which is higher than the 1.2.11 needed.
+	if [[ "${RELEASE}" == "trixie" ]]; then
+		display_alert "No alsa-ucm-conf hacks needed for ${BOARD}" "${RELEASE} already has the necessary alsa-ucm-conf" "info"
+		return 0
+	fi
+
 	display_alert "Fixing alsa-ucm-conf for ${BOARD}" "${RELEASE}///${BOARD}" "warn"
 	(
-		cd "${SDCARD}/usr/share/alsa"
+		cd "${SDCARD}/usr/share/alsa" || exit 6
 		curl -L "https://github.com/alsa-project/alsa-ucm-conf/archive/refs/heads/master.tar.gz" | tar xvzf - --strip-components=1
 	)
 
@@ -113,16 +116,6 @@ function post_family_tweaks_bsp__thinkpad_x13s_bsp_always_start_pdmapper() {
 	EOD
 }
 
-# Disabled, see https://github.com/jhovold/linux/wiki/X13s#touchscreen
-# function post_family_tweaks_bsp__thinkpad_x13s_bsp_touchscreen_udev_unbind_i2c_hid_hack() {
-# 	## Hack in udev so touchscreen can work - from https://github.com/ironrobin/x13s-alarm/tree/trunk/x13s-touchscreen-udev
-# 	display_alert "Adding to bsp-cli" "${BOARD}: udev for touchscreen bind" "info"
-# 	add_file_from_stdin_to_bsp_destination "/usr/lib/udev/rules.d/72-x13s-touchscreen.rules" <<- 'EOD'
-# 		ACTION=="add" \
-# 		, RUN+="/bin/bash -c 'echo 4-0010 > /sys/bus/i2c/drivers/i2c_hid_of/bind'"
-# 	EOD
-# }
-
 ##
 ## Include certain firmware in the initrd
 ##