Merge openwrt

.gitattributes

@@ -1 +1,2 @@
 * -text
+*.patch whitespace=-indent-with-non-tab,-space-before-tab,-tab-in-indent,-trailing-space

.github/labeler.yml

@@ -0,0 +1,249 @@
+# target/*
+"target/airoha":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/airoha/**"
+"target/apm821xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/apm821xx/**"
+"target/archs38":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/archs38/**"
+"target/armsr":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/armsr/**"
+"target/at91":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/at91/**"
+    - "package/boot/at91bootstrap/**"
+    - "package/boot/uboot-at91/**"
+"target/ath79":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/ath79/**"
+"target/bcm27xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/bcm27xx/**"
+    - "package/kernel/bcm27xx-gpu-fw/**"
+    - "package/utils/bcm27xx-utils/**"
+"target/bcm47xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/bcm47xx/**"
+"target/bcm4908":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/bcm4908/**"
+    - "package/boot/uboot-bcm4908/**"
+    - "package/boot/arm-trusted-firmware-bcm63xx/**"
+"target/bcm53xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/bcm53xx/**"
+    - "package/boot/uboot-bcm53xx/**"
+"target/bmips":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/bmips/**"
+    - "package/boot/uboot-bmips/**"
+    - "package/kernel/bcm63xx-cfe/**"
+"target/d1":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/d1/**"
+    - "package/boot/uboot-d1/**"
+    - "package/boot/opensbi/**"
+"target/gemini":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/gemini/**"
+"target/imx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/imx/**"
+    - "package/boot/imx-bootlets/**"
+    - "package/boot/uboot-imx/**"
+"target/ipq40xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/ipq40xx/**"
+"target/ipq806x":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/ipq806x/**"
+"target/qualcommax":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/qualcommax/**"
+"target/ixp4xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/ixp4xx/**"
+    - "package/boot/apex/Makefile/**"
+    - "package/firmware/ixp4xx-microcode/**"
+"target/kirkwood":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/kirkwood/**"
+    - "package/boot/uboot-kirkwood/**"
+"target/lantiq":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/lantiq/**"
+    - "package/kernel/lantiq/**"
+    - "package/firmware/lantiq/**"
+    - "package/boot/uboot-lantiq/**"
+"target/layerscape":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/layerscape/**"
+    - "package/firmware/layerscape/**"
+    - "package/boot/tfa-layerscape/**"
+    - "package/boot/uboot-layerscape/**"
+    - "package/network/utils/layerscape/**"
+"target/loongarch64":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/loongarch64/**"
+"target/malta":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/malta/**"
+"target/mediatek":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/mediatek/**"
+    - "package/boot/arm-trusted-firmware-mediatek/**"
+    - "package/boot/uboot-mediatek/**"
+"target/mpc85xx":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/mpc85xx/**"
+"target/mvebu":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/mvebu/**"
+    - "package/boot/arm-trusted-firmware-mvebu/**"
+    - "package/boot/uboot-mvebu/**"
+"target/mxs":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/mxs/**"
+    - "package/boot/uboot-mxs/**"
+"target/octeon":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/octeon/**"
+"target/omap":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/omap/**"
+    - "package/boot/uboot-omap/**"
+"target/pistachio":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/pistachio/**"
+"target/qoriq":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/qoriq/**"
+"target/ramips":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/ramips/**"
+"target/realtek":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/realtek/**"
+"target/rockchip":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/rockchip/**"
+    - "package/boot/arm-trusted-firmware-rockchip/**"
+    - "package/boot/uboot-rockchip/**"
+"target/sifiveu":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/sifiveu/**"
+    - "package/boot/uboot-sifiveu/**"
+    - "package/boot/opensbi/**"
+"target/siflower":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/siflower/**"
+"target/starfive":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/starfive/**"
+"target/stm32":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/stm32/**"
+    - "package/boot/arm-trusted-firmware-stm32/**"
+    - "package/boot/optee-os-stm32/**"
+    - "package/boot/uboot-stm32/**"
+"target/sunxi":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/sunxi/**"
+    - "package/boot/arm-trusted-firmware-sunxi/**"
+    - "package/boot/uboot-sunxi/**"
+"target/tegra":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/tegra/**"
+    - "package/boot/uboot-tegra/**"
+"target/uml":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/uml/**"
+"target/x86":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/x86/**"
+"target/zynq":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/zynq/**"
+    - "package/boot/uboot-zynq/**"
+# target/imagebuilder
+"target/imagebuilder":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/imagebuilder/**"
+# kernel
+"kernel":
+- changed-files:
+  - any-glob-to-any-file:
+    - "target/linux/generic/**"
+    - "target/linux/**/config-*"
+    - "target/linux/**/patches-*"
+    - "target/linux/**/files/**"
+    - "package/kernel/linux/**"
+# core packages
+"core packages":
+- changed-files:
+  - any-glob-to-any-file:
+    - "package/**"
+# build/scripts/tools
+"build/scripts/tools":
+- changed-files:
+  - any-glob-to-any-file:
+    - "include/**"
+    - "scripts/**"
+    - "tools/**"
+# toolchain
+"toolchain":
+- changed-files:
+  - any-glob-to-any-file:
+    - "toolchain/**"
+# GitHub/CI
+"GitHub/CI":
+- changed-files:
+  - any-glob-to-any-file:
+    - ".github/**"

config/Config-build.in

@@ -70,7 +70,7 @@ menu "Global build settings"
 
 	config USE_APK
 		imply PACKAGE_apk-mbedtls
-		bool "Use APK instead of OPKG to build distribution (EXPERIMENTAL)"
+		bool "Use APK instead of OPKG to build distribution"
 		default y
 
 	comment "General build options"
@@ -423,10 +423,9 @@ menu "Global build settings"
 
 	endchoice
 
-	config SECCOMP
+	config USE_SECCOMP
 		bool "Enable SECCOMP"
 		select KERNEL_SECCOMP
-		select PACKAGE_procd-seccomp
 		depends on (aarch64 || arm || armeb || mips || mipsel || mips64 || mips64el || i386 || powerpc || x86_64)
 		depends on !TARGET_uml
 		default y

config/Config-kernel.in

@@ -333,6 +333,25 @@ if KERNEL_TASKSTATS
 
 endif
 
+config KERNEL_PSI
+	bool "Compile the kernel with pressure stall information tracking"
+	help
+	  Collect metrics that indicate how overcommitted the CPU, memory,
+	  and IO capacity are in the system.
+
+	  If you say Y here, the kernel will create /proc/pressure/ with the
+	  pressure statistics files cpu, memory, and io. These will indicate
+	  the share of walltime in which some or all tasks in the system are
+	  delayed due to contention of the respective resource.
+
+	  In kernels with cgroup support, cgroups (cgroup2 only) will
+	  have cpu.pressure, memory.pressure, and io.pressure files,
+	  which aggregate pressure stalls for the grouped tasks only.
+
+	  For more details see Documentation/accounting/psi.rst.
+
+	  Say N if unsure.
+
 config KERNEL_KALLSYMS
 	bool "Compile the kernel with symbol table information"
 	default y if !SMALL_FLASH

feeds.conf.default

@@ -4,7 +4,7 @@ src-git routing https://git.openwrt.org/feed/routing.git
 src-git telephony https://git.openwrt.org/feed/telephony.git
 src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.5-K6.x
 src-git sqm_scripts_nss https://github.com/qosmio/sqm-scripts-nss.git
-#src-git video https://github.com/openwrt/video.git
+src-git video https://github.com/openwrt/video.git
 #src-git targets https://github.com/openwrt/targets.git
 #src-git oldpackages http://git.openwrt.org/packages.git
 #src-link custom /usr/src/openwrt/custom-feed

include/feeds.mk

@@ -37,7 +37,7 @@ define FeedSourcesAppendOPKG
   echo 'src/gz %d_core %U/targets/%S/packages'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
 	echo 'src/gz %d_base %U/packages/%A/base'; \
-	$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
+	$(if $(CONFIG_BUILDBOT), \
 		echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \
@@ -51,7 +51,7 @@ define FeedSourcesAppendAPK
   echo '%U/targets/%S/packages/packages.adb'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
 	echo '%U/packages/%A/base/packages.adb'; \
-	$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
+	$(if $(CONFIG_BUILDBOT), \
 		echo '%U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)/packages.adb';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \

include/image-commands.mk

@@ -391,8 +391,8 @@ define Build/fit
 		$(if $(DEVICE_DTS_OVERLAY),$(foreach dtso,$(DEVICE_DTS_OVERLAY), -O $(dtso):$(KERNEL_BUILD_DIR)/image-$(dtso).dtbo)) \
 		-c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \
 		-A $(LINUX_KARCH) -v $(LINUX_VERSION), gen-cpio$(if $(TARGET_PER_DEVICE_ROOTFS),.$(ROOTFS_ID/$(DEVICE_NAME))))
-	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\
-		-E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f $@.its $@.new
+	$(call locked,PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(findstring external,$(word 3,$(1))),\
+		-E -B 0x1000 $(if $(findstring static,$(word 3,$(1))),-p 0x1000)) -f $@.its $@.new)
 	@mv $@.new $@
 endef
 
@@ -732,6 +732,10 @@ define Build/zip
 	rm -rf $@.tmp
 endef
 
+define Build/zyimage
+	$(STAGING_DIR_HOST)/bin/zyimage $(1) $@
+endef
+
 define Build/zyxel-ras-image
 	let \
 		newsize="$(call exp_units,$(RAS_ROOTFS_SIZE))"; \

include/image.mk

@@ -373,7 +373,7 @@ ifneq ($(CONFIG_USE_APK),)
 	rm -rf $(mkfs_cur_target_dir)
 	$(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
 	$(if $(mkfs_packages_remove), \
-		$(apk_target) del $(mkfs_packages_remove))
+		-$(apk_target) del $(mkfs_packages_remove))
 	$(if $(mkfs_packages_add), \
 		$(apk_target) add $(mkfs_packages_add))
 else

include/kernel-6.6

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .61
-LINUX_KERNEL_HASH-6.6.61 = 418fc24df9190f1c3ed9906dc3b7651c2a2eae5c1cb9ab4a6348e20faf047c0b
+LINUX_VERSION-6.6 = .66
+LINUX_KERNEL_HASH-6.6.66 = 9d757937c4661c2f512c62641b74ef74eff9bb13dc5dbcbaaa108c21152f1e52