diff --git a/linux/7.0.6 b/linux/7.1.1 similarity index 100% rename from linux/7.0.6 rename to linux/7.1.1 diff --git a/linux/Config.in b/linux/Config.in index 84246b42280..0aa35bd028f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -30,8 +30,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (7.0)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_0 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (7.1)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1 if BR2_KERNEL_HEADERS_AS_KERNEL # mips always generates an ITB image select BR2_PACKAGE_HOST_UBOOT_TOOLS if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el @@ -143,7 +143,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "7.0.6" if BR2_LINUX_KERNEL_LATEST_VERSION + default "7.1.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.254-cip72" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.254-cip72-rt32" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ @@ -187,9 +187,11 @@ config BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG bool "Use the architecture default configuration" # We know that the default configuration on many architectures # requires host-openssl, so select it for the latest kernel - # version. This is mainly needed to fix autobuilder testing. + # version and the latest CIP version. + # This is mainly needed to fix autobuilder testing. select BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL if \ - BR2_LINUX_KERNEL_LATEST_VERSION + BR2_LINUX_KERNEL_LATEST_VERSION || \ + BR2_LINUX_KERNEL_LATEST_CIP_VERSION help This option will use the default configuration for the selected architecture. I.e, it is equivalent to running diff --git a/linux/before-6.17/linux.hash b/linux/before-6.17/linux.hash index ba20750b7b7..688b99ded66 100644 --- a/linux/before-6.17/linux.hash +++ b/linux/before-6.17/linux.hash @@ -1,10 +1,10 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 cc12a7644b4cef9e06627b29de8753e22b3d076703a9b52be84263e05c8b9830 linux-6.12.87.tar.xz -sha256 add06b5fdb655c7e575fbfa29e7bab23a3c36c5388e77fa759ed4b0d1a55a80f linux-6.6.138.tar.xz -sha256 f1672e610dc9e05e33de1803857e26c5abe1d1ab0a2ea74b0d8269267f73b499 linux-6.1.172.tar.xz +sha256 e998a232b9418db3301cb58468e291a4f41d6ab8306029b30d991f56251dc8d2 linux-6.12.94.tar.xz +sha256 dace1f8dc9c0dbf5df14f47e3229cd62c298e83049681731ef229f2ba7592932 linux-6.6.143.tar.xz +sha256 aa19772dba40e9737356c00d0671cdedbe26cc895eff062868f0a1f688ae44f6 linux-6.1.176.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 5fc6ce4f4cfb17977bc6e14c52a0e10846544f1ffc133aac26d6de7e14a5e61f linux-5.15.206.tar.xz -sha256 3956b387bfb5133c00f3f7f76a0a436934a349e8a9319a231a1b5b829d7866a7 linux-5.10.255.tar.xz +sha256 910ba46ae15e7495a9624f89d7f11b24ccc8bc1ee4b3abdd502e75b055290a01 linux-5.15.210.tar.xz +sha256 aa5e8e580a555e55176658b78fb6759f9c84654462b735119d4e819b5c46b609 linux-5.10.259.tar.xz # Locally computed sha256 bd5db7fe3b0475cce4fc72db7a7f7df1c22b970aabe5ebff6ddd48098973bdf2 linux-cip-5.10.254-cip72.tar.gz sha256 97d7d5139900c10ff7435779be4857dda531e7cf6abba52c12a5f39aae195411 linux-cip-5.10.254-cip72-rt32.tar.gz diff --git a/linux/from-6.17/linux.hash b/linux/from-6.17/linux.hash index 9aa69b6e96f..33ee9dc232c 100644 --- a/linux/from-6.17/linux.hash +++ b/linux/from-6.17/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v7.x/sha256sums.asc -sha256 691f44797fbe790dc8a321604c927087526ad27b6d649925d60f8eed0a2564a0 linux-7.1.tar.xz -sha256 57edc9a41efc1ca6b797afa8f4a587a30da2af6bca7356eb56e1e1a4ada265da linux-7.0.12.tar.xz +sha256 5215fa3541dc7e7f5bcd51bf7e57f169cec6fce508ca54e3dc85fdee14371d7d linux-7.1.1.tar.xz +sha256 3c81edd0f716aca3dd48dff691681827580cc53d35a8eec3be47d346d1f89913 linux-7.0.13.tar.xz # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 f78602932219125e211c5f5bfd84edcfd4ec5ce88fc944f8248413f665bef236 linux-6.18.35.tar.xz +sha256 fbab86c9f471c81075b280cca30bd85d790c060063a1245859b6344b07c9c44e linux-6.18.36.tar.xz # Licenses hashes sha256 fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0 COPYING diff --git a/linux/linux.mk b/linux/linux.mk index bc01b3423ee..d92d2782ba4 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -164,7 +164,7 @@ LINUX_MAKE_FLAGS = \ CROSS_COMPILE="$(TARGET_CROSS)" \ WERROR=0 \ REGENERATE_PARSERS=1 \ - DEPMOD=$(HOST_DIR)/sbin/depmod + DEPMOD=true ifeq ($(BR2_REPRODUCIBLE),y) LINUX_MAKE_ENV += \ @@ -474,7 +474,6 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO) $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224)) $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) - $(call KCONFIG_DISABLE_OPT,CONFIG_WERROR) $(PACKAGES_LINUX_CONFIG_FIXUPS) endef diff --git a/package/esp-hosted/0001-fix-esp_hosted_ng-Fix-build-for-kernel-7.1.patch b/package/esp-hosted/0001-fix-esp_hosted_ng-Fix-build-for-kernel-7.1.patch new file mode 100644 index 00000000000..90076b49560 --- /dev/null +++ b/package/esp-hosted/0001-fix-esp_hosted_ng-Fix-build-for-kernel-7.1.patch @@ -0,0 +1,147 @@ +From fa27d70495e3b4f92c9de43b33aa09813a318495 Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Mon, 18 May 2026 16:44:57 +0200 +Subject: [PATCH] fix(esp_hosted_ng): Fix build for kernel 7.1 + +With commit: +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=033fe322f5852d5144a85978e880e01b1787fd0d +many functions esp_cfg80211_*() have argument struct netdevice * subsituted +with struct wireless_dev *. So let's add separate function headers and +retrieve struct netdev * from struct wireless_dev * if Linux version >= 7.1. + +Upstream: https://github.com/espressif/esp-hosted/pull/736 +Signed-off-by: Giulio Benetti +--- + esp_hosted_ng/host/esp_cfg80211.c | 50 +++++++++++++++++++++++++++++++ + 1 file changed, 50 insertions(+) + +diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c +index c68f7983e6..1009df1fd5 100644 +--- a/esp_hosted_ng/host/esp_cfg80211.c ++++ b/esp_hosted_ng/host/esp_cfg80211.c +@@ -533,22 +533,38 @@ static int esp_cfg80211_set_default_key(struct wiphy *wiphy, + } + + static int esp_cfg80211_set_default_mgmt_key(struct wiphy *wiphy, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++ struct wireless_dev *wdev, INT_LINK_ID u8 key_index) ++#else + struct net_device *ndev, INT_LINK_ID u8 key_index) ++#endif + { + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++static int esp_cfg80211_del_key(struct wiphy *wiphy, struct wireless_dev *wdev, ++#else + static int esp_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, ++#endif + INT_LINK_ID u8 key_index, bool pairwise, + const u8 *mac_addr) + { + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++static int esp_cfg80211_add_key(struct wiphy *wiphy, struct wireless_dev *wdev, ++ INT_LINK_ID u8 key_index, bool pairwise, ++ const u8 *mac_addr, struct key_params *params) ++{ ++ struct net_device *dev = wdev->netdev; ++#else + static int esp_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + INT_LINK_ID u8 key_index, bool pairwise, + const u8 *mac_addr, struct key_params *params) + { ++#endif + struct esp_wifi_device *priv = NULL; + + if (!wiphy || !dev || !params) { +@@ -564,7 +580,11 @@ static int esp_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, + esp_dbg("\n"); + + if (params->key_len == 0) { ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++ return esp_cfg80211_del_key(wiphy, wdev, ZERO_LINK_ID key_index, pairwise, mac_addr); ++#else + return esp_cfg80211_del_key(wiphy, dev, ZERO_LINK_ID key_index, pairwise, mac_addr); ++#endif + } + return cmd_add_key(priv, key_index, pairwise, mac_addr, params); + } +@@ -783,9 +803,16 @@ static int esp_cfg80211_set_tx_power(struct wiphy *wiphy, + return cmd_set_tx_power(priv, priv->tx_pwr); + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++static int esp_cfg80211_get_station(struct wiphy *wiphy, struct wireless_dev *wdev, ++ const u8 *mac, struct station_info *sinfo) ++{ ++ struct net_device *ndev = wdev->netdev; ++#else + static int esp_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, + const u8 *mac, struct station_info *sinfo) + { ++#endif + struct esp_wifi_device *priv = NULL; + + priv = netdev_priv(ndev); +@@ -1034,9 +1061,16 @@ static int esp_cfg80211_probe_client(struct wiphy *wiphy, struct net_device *dev + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++static int esp_cfg80211_del_station(struct wiphy *wiphy, struct wireless_dev *wdev, ++ struct station_del_parameters *params) ++{ ++ struct net_device *dev = wdev->netdev; ++#else + static int esp_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, + struct station_del_parameters *params) + { ++#endif + struct esp_wifi_device *priv = NULL; + + if (!wiphy || !dev) { +@@ -1055,10 +1089,18 @@ static int esp_cfg80211_del_station(struct wiphy *wiphy, struct net_device *dev, + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++static int esp_cfg80211_add_station(struct wiphy *wiphy, struct wireless_dev *wdev, ++ const u8 *mac, ++ struct station_parameters *params) ++{ ++ struct net_device *dev = wdev->netdev; ++#else + static int esp_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, + const u8 *mac, + struct station_parameters *params) + { ++#endif + struct esp_wifi_device *priv = NULL; + + if (!wiphy || !dev) { +@@ -1078,10 +1120,18 @@ static int esp_cfg80211_add_station(struct wiphy *wiphy, struct net_device *dev, + return 0; + } + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0)) ++static int esp_cfg80211_change_station(struct wiphy *wiphy, ++ struct wireless_dev *wdev, const u8 *mac, ++ struct station_parameters *params) ++{ ++ struct net_device *dev = wdev->netdev; ++#else + static int esp_cfg80211_change_station(struct wiphy *wiphy, + struct net_device *dev, const u8 *mac, + struct station_parameters *params) + { ++#endif + struct esp_wifi_device *priv = NULL; + + if (!wiphy || !dev) { +-- +2.47.3 + diff --git a/package/linux-headers/5.10.255 b/package/linux-headers/5.10.259 similarity index 100% rename from package/linux-headers/5.10.255 rename to package/linux-headers/5.10.259 diff --git a/package/linux-headers/5.15.206 b/package/linux-headers/5.15.210 similarity index 100% rename from package/linux-headers/5.15.206 rename to package/linux-headers/5.15.210 diff --git a/package/linux-headers/6.1.172 b/package/linux-headers/6.1.176 similarity index 100% rename from package/linux-headers/6.1.172 rename to package/linux-headers/6.1.176 diff --git a/package/linux-headers/6.12.87 b/package/linux-headers/6.12.94 similarity index 100% rename from package/linux-headers/6.12.87 rename to package/linux-headers/6.12.94 diff --git a/package/linux-headers/6.18.29 b/package/linux-headers/6.18.36 similarity index 100% rename from package/linux-headers/6.18.29 rename to package/linux-headers/6.18.36 diff --git a/package/linux-headers/6.6.138 b/package/linux-headers/6.6.143 similarity index 100% rename from package/linux-headers/6.6.138 rename to package/linux-headers/6.6.143 diff --git a/package/linux-headers/7.0.6 b/package/linux-headers/7.0.13 similarity index 100% rename from package/linux-headers/7.0.6 rename to package/linux-headers/7.0.13 diff --git a/package/linux-headers/7.1.1 b/package/linux-headers/7.1.1 new file mode 120000 index 00000000000..a4e1d3ec9c8 --- /dev/null +++ b/package/linux-headers/7.1.1 @@ -0,0 +1 @@ +../../linux/from-6.17 \ No newline at end of file diff --git a/package/linux-headers/7.1/7.1 b/package/linux-headers/7.1/7.1 deleted file mode 100644 index a4e1d3ec9c8..00000000000 --- a/package/linux-headers/7.1/7.1 +++ /dev/null @@ -1 +0,0 @@ -../../linux/from-6.17 \ No newline at end of file diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 673a7ee3df1..a890c8f161f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -476,14 +476,14 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "5.10.258" if BR2_KERNEL_HEADERS_5_10 - default "5.15.209" if BR2_KERNEL_HEADERS_5_15 - default "6.1.175" if BR2_KERNEL_HEADERS_6_1 - default "6.6.142" if BR2_KERNEL_HEADERS_6_6 - default "6.12.93" if BR2_KERNEL_HEADERS_6_12 - default "6.18.35" if BR2_KERNEL_HEADERS_6_18 - default "7.0.12" if BR2_KERNEL_HEADERS_7_0 - default "7.1" if BR2_KERNEL_HEADERS_7_1 + default "5.10.259" if BR2_KERNEL_HEADERS_5_10 + default "5.15.210" if BR2_KERNEL_HEADERS_5_15 + default "6.1.176" if BR2_KERNEL_HEADERS_6_1 + default "6.6.143" if BR2_KERNEL_HEADERS_6_6 + default "6.12.94" if BR2_KERNEL_HEADERS_6_12 + default "6.18.36" if BR2_KERNEL_HEADERS_6_18 + default "7.0.13" if BR2_KERNEL_HEADERS_7_0 + default "7.1.1" if BR2_KERNEL_HEADERS_7_1 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ @@ -497,4 +497,4 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS_LICENSE_FILES default "COPYING LICENSES/preferred/GPL-2.0 LICENSES/exceptions/Linux-syscall-note" help A space-separated list of license files related to the Linux - kernel headers. \ No newline at end of file + kernel headers. diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 344abee8b37..e208a78e716 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -32,7 +32,17 @@ define NET_TOOLS_ENABLE_IPV6 $(SED) 's:_AFINET6 0:_AFINET6 1:' $(@D)/config.h endef -NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6 +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_7_1),y) +define NET_TOOLS_DISABLE_ROSE + $(SED) 's:HAVE_AFROSE 1:HAVE_AFROSE 0:' \ + -e 's:HAVE_HWROSE 1:HAVE_HWROSE 0:' $(@D)/config.h +endef +endif + +NET_TOOLS_POST_CONFIGURE_HOOKS += \ + NET_TOOLS_DISABLE_ROSE \ + NET_TOOLS_ENABLE_I18N \ + NET_TOOLS_ENABLE_IPV6 define NET_TOOLS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/rtl8822cs/rtl8822cs.hash b/package/rtl8822cs/rtl8822cs.hash index ff2e5d3eaa6..fa5c9b1f89d 100644 --- a/package/rtl8822cs/rtl8822cs.hash +++ b/package/rtl8822cs/rtl8822cs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 71d1d29d1f04a9decaba4e23df0b213fb454c4cf15f6305133d2821188b588b0 rtl8822cs-2519c0b865e31d93daa65fc5b1168722f6ec7526.tar.gz +sha256 eecd40ef41e3dabd7263f48330d35a138092637063c5d5d4cc3936939502df82 rtl8822cs-55971663534233fd8d80363ddcb2fec1c01c473c.tar.gz diff --git a/package/rtl8822cs/rtl8822cs.mk b/package/rtl8822cs/rtl8822cs.mk index c6a541dd996..531a07e60d0 100644 --- a/package/rtl8822cs/rtl8822cs.mk +++ b/package/rtl8822cs/rtl8822cs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8822CS_VERSION = 2519c0b865e31d93daa65fc5b1168722f6ec7526 +RTL8822CS_VERSION = 55971663534233fd8d80363ddcb2fec1c01c473c RTL8822CS_SITE = $(call github,jethome-iot,rtl88x2cs,$(RTL8822CS_VERSION)) RTL8822CS_LICENSE = GPL-2.0 diff --git a/package/strace/Config.in b/package/strace/Config.in index ff7d271c0c1..e3e7018c65a 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -1,11 +1,6 @@ config BR2_PACKAGE_STRACE bool "strace" - # needs at least kernel headers 5.0 on xtensa - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa - # needs at least kernel headers 5.0 on musl aarch64 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || \ - !(BR2_aarch64 || BR2_aarch64_be) || \ - !BR2_TOOLCHAIN_USES_MUSL + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 # time_types.h depends on !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. @@ -17,11 +12,5 @@ config BR2_PACKAGE_STRACE https://strace.io -comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" - depends on BR2_xtensa - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 - -comment "strace needs a musl toolchain w/ headers >= 5.0 on aarch64" - depends on BR2_aarch64 || BR2_aarch64_be - depends on BR2_TOOLCHAIN_USES_MUSL - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 +comment "strace needs a toolchain w/ headers >= 5.1" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 diff --git a/package/strace/strace.hash b/package/strace/strace.hash index ad164dfa5c3..8df107c9486 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,6 +1,5 @@ -# Locally calculated after checking signature with RSA key from -# https://raw.githubusercontent.com/strace/strace/refs/tags/v7.0/GPG-KEY -# https://strace.io/files/7.0/strace-7.0.tar.xz.asc -sha256 6c92419be3f2ec560b31728a4652217c59864c8642ba7b1b3771b1b013ad074b strace-7.0.tar.xz +# From https://github.com/strace/strace/releases/tag/v7.1 +sha256 81743ecf2a5b44186b2f5038afdc8beda7e5c70aed15b4fbfbcc6e9ece24490f strace-7.1.tar.xz +# Locally computed sha256 b897cf6bb865cdd72f49fba6ca7b66ad075b9bc51d3cf372923220ce18b5350f COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index 5f39bba1bdb..a0688939cac 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 7.0 +STRACE_VERSION = 7.1 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+