Merge branch 'main' into podman

Author: tmshlvck

.github/CODEOWNERS

@@ -86,6 +86,7 @@ config/boards/mksklipad50.conf		@torte71
 config/boards/mkspi.csc		@redrathnure
 config/boards/nanopct6-lts.conf		@SuperKali @Tonymac32
 config/boards/nanopct6.conf		@SuperKali @Tonymac32
+config/boards/nanopi-m5.conf		@SuperKali
 config/boards/nanopi-m6.conf		@efectn
 config/boards/nanopi-r3s-lts.conf		@pyavitz
 config/boards/nanopi-r5s.csc		@utlark

config/sources/families/include/sunxi64_common.inc

@@ -35,8 +35,8 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.15.4"
+		declare -g KERNEL_MAJOR_MINOR="6.16" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.16.8"
 		;;
 esac
 

config/sources/families/include/sunxi_common.inc

@@ -36,8 +36,8 @@ case $BRANCH in
 		;;
 
 	edge)
-		declare -g KERNEL_MAJOR_MINOR="6.15" # Major and minor versions of this kernel.
-		declare -g KERNELBRANCH="tag:v6.15.4"
+		declare -g KERNEL_MAJOR_MINOR="6.16" # Major and minor versions of this kernel.
+		declare -g KERNELBRANCH="tag:v6.16.8"
 		;;
 esac
 

config/sources/mainline-kernel.conf.sh

@@ -8,7 +8,7 @@
 function mainline_kernel_decide_version__upstream_release_candidate_number() {
 	[[ -n "${KERNELBRANCH}" ]] && return 0           # if already set, don't touch it; that way other hooks can run in any order
 	if [[ "${KERNEL_MAJOR_MINOR}" == "6.17" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
-		declare -g KERNELBRANCH="tag:v6.17-rc1"
+		declare -g KERNELBRANCH="tag:v6.17-rc5"
 		display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
 	fi
 }

lib/functions/compilation/patch/drivers_network.sh

@@ -38,7 +38,7 @@ driver_rtl8189ES() {
 
 	# Wireless drivers for Realtek 8189ES chipsets
 
-	if linux-version compare "${version}" ge 3.14; then
+	if linux-version compare "${version}" ge 3.14 && linux-version compare "${version}" le 6.16; then
 
 		# Attach to specific commit (was "branch:master")
 		local rtl8189esver='commit:07f03cf721f5e0317012ece4159834327680ba8b' # Commit date: 2025-06-21 (please update when updating commit ref)
@@ -160,6 +160,9 @@ driver_rtl8192EU() {
 
 		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-p2p-go-advertising.patch" "applying"
 
+		# fix compilation for kernels >= 6.17
+		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-6.16-6.17.patch" "applying"
+
 		# fix compilation for kernels >= 5.4
 		process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-VFS-import.patch" "applying"
 

lib/functions/general/extensions.sh

@@ -577,10 +577,14 @@ function enable_extensions_with_hostdeps_builtin_and_user() {
 
 	# Extensions are files of the format <dir>/extension_name.sh or <dir>/extension_name/extension_name.sh
 	for ext_dir in "${ext_dirs[@]}"; do
+		display_alert "Extension search" "Searching in directory: \"${ext_dir}\"" ""
 		if [[ -d "${ext_dir}" ]]; then
 			declare -a ext_list_dir=()
-			mapfile -t ext_list_dir < <(find "${ext_dir}" -maxdepth 2 -type f -name "*.sh" -print0 | xargs -0 grep -l "${grep_args[@]}")
+			mapfile -t ext_list_dir < <(find "${ext_dir}" -maxdepth 2 -type f -name "*.sh" -print0 | xargs -0 -r grep -l "${grep_args[@]}" 2>/dev/null || true)
+			display_alert "Extension search result" "Found ${#ext_list_dir[@]} extensions in \"${ext_dir}\"" ""
 			extension_list+=("${ext_list_dir[@]}")
+		else
+			display_alert "Extension search" "Directory does not exist: \"${ext_dir}\"" "wrn"
 		fi
 	done
 

patch/kernel/archive/sunxi-6.16/0000.patching_config.yaml

@@ -0,0 +1,38 @@
+config:
+
+  # Just some info stuff; not used by the patching scripts
+  name: sunxi-6.16
+  kind: kernel
+  type: mainline # or: mainline
+  branch: linux-6.16.y
+  last-known-good-tag: v6.7.0
+  maintainers:
+    - { github: pyavitz, name: Patrick Yavitz, email: [email protected], armbian-forum: c0rnelius }
+
+  # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
+  # This is meant to provide a way to "add a board DTS" without having to null-patch them in.
+  dts-directories:
+    # will copy patch/kernel/archive/meson64-MAJOR.MINOR/dt-boards/*.dts to arch/arm64/boot/dts/allwinner
+    - { source: "dt", target: "arch/arm64/boot/dts/allwinner" }
+
+  # every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones
+  # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in.
+  # @TODO need a solution to auto-Makefile the overlays as well
+#  overlay-directories:
+    # will copy patch/kernel/archive/meson64-MAJOR.MINOR/overlay/**/* to arch/arm64/boot/dts/allwinner/overlay
+#    - { source: "overlay", target: "arch/arm64/boot/dts/allwinner/overlay" }
+
+  # the Makefile in each of these directories will be magically patched to include the dts files copied
+  #  or patched-in; overlay subdir will be included "-y" if it exists.
+  # No more Makefile patching needed, yay!
+  auto-patch-dt-makefile:
+    - { directory: "arch/arm64/boot/dts/allwinner", config-var: "CONFIG_ARCH_SUNXI" }
+
+  # configuration for when applying patches to git / auto-rewriting patches (development cycle helpers)
+  patches-to-git:
+    do-not-commit-files:
+      - "MAINTAINERS" # constant churn, drop them. sorry.
+      - "Documentation/devicetree/bindings/arm/allwinner.yaml" # constant churn, conflicts on every bump, drop it. sorry.
+    do-not-commit-regexes: # Python-style regexes
+      - "^arch/([a-zA-Z0-9]+)/boot/dts/([a-zA-Z0-9]+)/Makefile$" # ignore DT Makefile patches, we've an auto-patcher now
+

patch/kernel/archive/sunxi-6.16/dt/sun50i-h618-bananapi-m4-zero.dts

@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2025 Patrick Yavitz <[email protected]>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h618-bananapi-m4.dtsi"
+
+/ {
+	model = "BananaPi BPI-M4-Zero";
+	compatible = "sinovoip,bpi-m4-zero", "allwinner,sun50i-h618";
+
+	aliases {
+		ethernet0 = &emac1;
+		i2c0 = &i2c0;
+		i2c1 = &i2c1;
+		i2c3 = &i2c3;
+		i2c4 = &i2c4;
+		serial4 = &uart4;
+		serial5 = &uart5;
+		spi1 = &spi1;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led-0 {
+			color = <LED_COLOR_ID_RED>;
+			function = LED_FUNCTION_STATUS;
+			gpios = <&pio 2 12 GPIO_ACTIVE_HIGH>;	/* PC12 */
+			linux,default-trigger = "heartbeat";
+		};
+	};
+};
+
+/* Connected to an on-board RTL8821CU USB WiFi chip. */
+&ehci1 {
+	status = "okay";
+};
+
+&ehci2 {
+	status = "okay";
+};
+
+&ehci3 {
+	status = "okay";
+};
+
+&emac1 {
+	status = "disabled";
+	pinctrl-names = "default";
+	pinctrl-0 = <&rmii_pins>;
+	phy-mode = "rmii";
+	phy-handle = <&rmii_phy>;
+	phy-supply = <&reg_dldo1>;
+	allwinner,rx-delay-ps = <3100>;
+	allwinner,tx-delay-ps = <700>;
+};
+
+&mdio1 {
+	rmii_phy: ethernet-phy@1 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <1>;
+	};
+};
+
+/* SDIO */
+&mmc1 {
+	status = "disabled";
+	bus-width = <4>;
+	max-frequency = <100000000>;
+
+	non-removable;
+	disable-wp;
+
+	/* WiFi firmware requires power to be kept while in suspend */
+	keep-power-in-suspend;
+
+	mmc-pwrseq = <&wifi_pwrseq>;
+
+	cd-gpios = <&pio 6 15 GPIO_ACTIVE_HIGH>; /* PG15 */
+	vmmc-supply = <&reg_vcc3v3>;
+
+	sdio: wifi@1 {
+		reg = <1>;
+		compatible = "brcm,bcm4329-fmac";
+	};
+};
+
+&ohci1 {
+	status = "okay";
+};
+
+&ohci2 {
+	status = "okay";
+};
+
+&ohci3 {
+	status = "okay";
+};
+
+&usbotg {
+	status = "okay";
+	dr_mode = "peripheral";
+};
+
+&usbphy {
+	status = "okay";
+	usb1_vbus-supply = <&reg_usb_vbus>;
+};