update v4.2.1 feeds hash

2025-12-16 09:10:02 +00:00 · 2023-03-23 19:44:40 +08:00 · 2023-03-23 19:44:40 +08:00 · 6a81722622
commit 6a81722622
parent fa83c2f285
10 changed files with 17 additions and 16 deletions
--- a/patches-mt798x-7.6.6.1/0002-init-from-mediatek-sdk-v7.6.6.1.patch
+++ b/patches-mt798x-7.6.6.1/0002-init-from-mediatek-sdk-v7.6.6.1.patch
@ -1,4 +1,4 @@
-From a150cac1ac161be34aeceb01686d9eb4896d821b Mon Sep 17 00:00:00 2001
+From 242ff3407b85e473a7f63f21f2752c5175f55a8a Mon Sep 17 00:00:00 2001
 From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
 Date: Mon, 19 Sep 2022 11:24:33 +0800
 Subject: [PATCH] init from mediatek sdk v7.6.6.1
@ -6,7 +6,7 @@ Subject: [PATCH] init from mediatek sdk v7.6.6.1
 Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
 ---
 config/Config-build.in                        |   14 -
- feeds.conf.default                            |    8 +-
+ feeds.conf.default                            |   10 +-
 include/image-commands.mk                     |    5 +-
 include/image.mk                              |   12 +-
 include/uclibc++.mk                           |   18 +-
@ -344,7 +344,7 @@ Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
 .../src/libfdt/libfdt_env.h                   |   96 +
 .../src/libfdt/libfdt_internal.h              |   51 +
 tools/fdt-patch-dm-verify/src/main.c          |  685 +++
- 339 files changed, 78301 insertions(+), 3338 deletions(-)
+ 339 files changed, 78302 insertions(+), 3339 deletions(-)
 delete mode 100755 package/base-files/files/sbin/wifi
 create mode 100644 package/boot/uboot-envtools/files/mediatek
 create mode 100644 package/network/utils/wireless-tools/patches/006-fix-iwconfig-rate-print-format.patch
@ -689,18 +689,19 @@ index 342859b7c0..c72ba74755 100644
 
 	config PKG_CHECK_FORMAT_SECURITY
 diff --git a/feeds.conf.default b/feeds.conf.default
-index f1827a3661..d51c4243ba 100644
+index f1827a3661..177943008c 100644
 --- a/feeds.conf.default
 +++ b/feeds.conf.default
@@ -1,5 +1,5 @@
 -src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
 -src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-21.02
 -src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
+-src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02
+-#src-link custom /usr/src/openwrt/custom-feed
 +src-git-full packages https://git.openwrt.org/feed/packages.git^e86c4376d
 +src-git-full luci https://git.openwrt.org/project/luci.git^63bfee6c8d
 +src-git-full routing https://git.openwrt.org/feed/routing.git^25e7648
- src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02
-#src-link custom /usr/src/openwrt/custom-feed
+src-git-full telephony https://git.openwrt.org/feed/telephony.git^920fbc5
 +src-git mtk_openwrt_feed https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds.git^df3fc79
 diff --git a/include/image-commands.mk b/include/image-commands.mk
 index 4d54a14ba4..a0694f2bac 100644
--- a/profiles/glinet_a1300.yml
+++ b/profiles/glinet_a1300.yml
@ -5,7 +5,7 @@ feeds:
    #path: ../feeds_dir/glinet
  - name: glinet
    uri: https://gitlab.com/gl.sdk4.0/gl.router/gl-sdk4-collect.git
-    revision: 54227ae108c25f0981cf6be25ad06d564f7c515f
+    revision: 8a9597681bedb8ee8d733d9347f7a4d63829bfd2

 packages:
  - gl-sdk4-adguardhome
--- a/profiles/glinet_ax1800.yml
+++ b/profiles/glinet_ax1800.yml
@ -4,7 +4,7 @@ description: Add the glinet dependencies
 feeds:
  - name: glinet
    uri: https://gitlab.com/gl.sdk4.0/gl.router/gl-sdk4-collect.git
-    revision: 54227ae108c25f0981cf6be25ad06d564f7c515f
+    revision: 8a9597681bedb8ee8d733d9347f7a4d63829bfd2

 packages:
  - i2c-tools
--- a/profiles/glinet_axt1800.yml
+++ b/profiles/glinet_axt1800.yml
@ -4,7 +4,7 @@ description: Add the glinet dependencies
 feeds:
  - name: glinet
    uri: https://gitlab.com/gl.sdk4.0/gl.router/gl-sdk4-collect.git
-    revision: 54227ae108c25f0981cf6be25ad06d564f7c515f
+    revision: 8a9597681bedb8ee8d733d9347f7a4d63829bfd2

 packages:
  - gl-sdk4-led
--- a/profiles/glinet_mt2500.yml
+++ b/profiles/glinet_mt2500.yml
@ -4,10 +4,10 @@ description: Add the glinet dependencies
 feeds:
  - name: glinet
    uri: https://gitlab.com/gl.sdk4.0/gl.router/gl-sdk4-collect.git
-    revision: b5395c0f1d26b9f592f5f77cf1dff02d4b05c050
+    revision: 8a9597681bedb8ee8d733d9347f7a4d63829bfd2
  - name: mt7981
    uri: https://gitlab.com/gl.sdk4.0/gl.router/mt7981-feeds.git
-    revision: 1c7ace232434b298cd8bab40c392a056763ca76f
+    revision: ebc8d5c447e1d2e0e13c0568a8514da68f8aa618

 packages:
  - kmod-usb-storage
--- a/profiles/glinet_mt3000.yml
+++ b/profiles/glinet_mt3000.yml
@ -7,7 +7,7 @@ feeds:
    revision: ebc8d5c447e1d2e0e13c0568a8514da68f8aa618
  - name: glinet
    uri: https://gitlab.com/gl.sdk4.0/gl.router/gl-sdk4-collect.git
-    revision: 54227ae108c25f0981cf6be25ad06d564f7c515f
+    revision: 8a9597681bedb8ee8d733d9347f7a4d63829bfd2

 packages:
  - gl-sdk4-led
--- a/profiles/target_ipq40xx_gl-a1300.yml
+++ b/profiles/target_ipq40xx_gl-a1300.yml
@ -6,7 +6,7 @@ description: Build image for the GL.iNET A1300
 feeds:
  - name: gl_feeds_commmon
    uri: https://github.com/gl-inet/gl-feeds.git
-    revision: 16d4e89ddfc13ab8551959c3c17dfe7699c709bf
+    revision: 341ee97aaa761c0fc93a0d28fc8634d42f7f7c4c
  - name: gl_feeds_21_02
    uri: https://github.com/gl-inet/gl-feeds.git
    revision: 581563a214d313c367d7ffe5a1e9038fc18292ed
--- a/profiles/target_mt7981_gl-mt2500.yml
+++ b/profiles/target_mt7981_gl-mt2500.yml
@ -7,7 +7,7 @@ description: Build image for the GL.iNET MT2500
 feeds:
  - name: gl_feed_common
    uri: https://github.com/gl-inet/gl-feeds.git
-    revision: 16d4e89ddfc13ab8551959c3c17dfe7699c709bf
+    revision: 341ee97aaa761c0fc93a0d28fc8634d42f7f7c4c
  - name: gl_feed_21_02
    uri: https://github.com/gl-inet/gl-feeds.git
    revision: 581563a214d313c367d7ffe5a1e9038fc18292ed
--- a/profiles/target_mt7981_gl-mt3000.yml
+++ b/profiles/target_mt7981_gl-mt3000.yml
@ -7,7 +7,7 @@ description: Build image for the GL.iNET MT3000
 feeds:
  - name: gl_feed_common
    uri: https://github.com/gl-inet/gl-feeds.git
-    revision: 16d4e89ddfc13ab8551959c3c17dfe7699c709bf
+    revision: 341ee97aaa761c0fc93a0d28fc8634d42f7f7c4c
  - name: gl_feed_21_02
    uri: https://github.com/gl-inet/gl-feeds.git
    revision: 581563a214d313c367d7ffe5a1e9038fc18292ed
--- a/profiles/target_wlan_ap-gl-ax1800-common.yml
+++ b/profiles/target_wlan_ap-gl-ax1800-common.yml
@ -11,7 +11,7 @@ feeds:
    path: ../../feeds/wifi-ax
  - name: gl_feeds_common
    uri: https://github.com/gl-inet/gl-feeds.git
-    revision: 16d4e89ddfc13ab8551959c3c17dfe7699c709bf
+    revision: 341ee97aaa761c0fc93a0d28fc8634d42f7f7c4c
  - name: luci
    uri: https://github.com/openwrt/luci.git
    revision: 1c3b32dc1bec15e3076a447762b1c4f94eb75fb7