him411/gl-infra-builder-FUjr
1
0
Fork 0
mirror of https://github.com/FUjr/gl-infra-builder.git synced 2025-12-18 18:14:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix 21.02 apply patch fail

Browse Source
This commit is contained in:
Weiping Yang 2023-03-08 04:18:17 -05:00
parent c3a3fc0f30
commit 97b7272e42
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0020-update-21.02-feeds.conf.default-feeds.patch Normal file
View File

@ -0,0 +1,25 @@
From 942c70abe941c628b2334155c77a662a7ef9a2c2 Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Wed, 8 Mar 2023 03:35:00 -0500
Subject: [PATCH] update 21.02 feeds.conf.default feeds
---
feeds.conf.default | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/feeds.conf.default b/feeds.conf.default
index e8d9548f60..1db3438e2f 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02
+src-git packages https://git.openwrt.org/feed/packages.git^477e23e85dfac98ba2372fecdcbf2013584a1542
+src-git luci https://git.openwrt.org/project/luci.git^a0c73faf502684bca2ffbdab511510f37d799b76
+src-git routing https://git.openwrt.org/feed/routing.git^83bb4b5d97a3af49d561d469be965c427bfc0db2
+src-git telephony https://git.openwrt.org/feed/telephony.git^920fbc5c0a2e4badf51bceff42e9a1e3eb693462
--
2.17.1

16
patches-21.02.2/0020-update-21.02-feeds.conf.default-feeds.patch
View File

@ -1,21 +1,21 @@
From 942c70abe941c628b2334155c77a662a7ef9a2c2 Mon Sep 17 00:00:00 2001 From 0a7bc224946df8c38a98fa69a7a5df52a6259d0b Mon Sep 17 00:00:00 2001
From: Weiping Yang <weiping.yang@gl-inet.com> From: Weiping Yang <weiping.yang@gl-inet.com>
Date: Wed, 8 Mar 2023 03:35:00 -0500 Date: Wed, 8 Mar 2023 04:10:23 -0500
Subject: [PATCH] update 21.02 feeds.conf.default feeds Subject: [PATCH] update-21.02-feeds.conf.default-feeds
--- ---
feeds.conf.default | 8 ++++---- feeds.conf.default | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/feeds.conf.default b/feeds.conf.default diff --git a/feeds.conf.default b/feeds.conf.default
index e8d9548f60..1db3438e2f 100644 index 3dfca3a7df..1db3438e2f 100644
--- a/feeds.conf.default --- a/feeds.conf.default
+++ b/feeds.conf.default +++ b/feeds.conf.default
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02 -src-git packages https://git.openwrt.org/feed/packages.git^b0ccc356900f6e1e1dc613d0ea980d5572f553dd
-src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02 -src-git luci https://git.openwrt.org/project/luci.git^cc582ebfb3cb2782db841ad2a4e908d1df4046f9
-src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02 -src-git routing https://git.openwrt.org/feed/routing.git^10d3ffd8b30186b49538167bac1fa1bf9c88f860
-src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02 -src-git telephony https://git.openwrt.org/feed/telephony.git^001ae7137c88bb679284bfac5087cde65b5abf9a
+src-git packages https://git.openwrt.org/feed/packages.git^477e23e85dfac98ba2372fecdcbf2013584a1542 +src-git packages https://git.openwrt.org/feed/packages.git^477e23e85dfac98ba2372fecdcbf2013584a1542
+src-git luci https://git.openwrt.org/project/luci.git^a0c73faf502684bca2ffbdab511510f37d799b76 +src-git luci https://git.openwrt.org/project/luci.git^a0c73faf502684bca2ffbdab511510f37d799b76
+src-git routing https://git.openwrt.org/feed/routing.git^83bb4b5d97a3af49d561d469be965c427bfc0db2 +src-git routing https://git.openwrt.org/feed/routing.git^83bb4b5d97a3af49d561d469be965c427bfc0db2