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

patches-22.03.4: format some patchs

Browse Source
This commit is contained in:
Xinfa Deng 2023-05-25 16:14:10 +08:00
parent f2f48e6d8e
commit 757c48a209
4 changed files with 44 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
patches-22.03.4/0003-fix-gl-mt1300-adapts-to-glinet-SDK4.0.patch
View File

@ -1,15 +1,15 @@
From b493ef55dfe0a03374ef6cb7b7934336c9cdc603 Mon Sep 17 00:00:00 2001 From 6c5c7e39d9a9767012610b2a836c3d6f54385657 Mon Sep 17 00:00:00 2001
From: gl-dengxinfa <xinfa.deng@gl-inet.com> From: gl-dengxinfa <xinfa.deng@gl-inet.com>
Date: Tue, 27 Sep 2022 12:15:27 +0800 Date: Tue, 27 Sep 2022 12:15:27 +0800
Subject: [PATCH] fix:gl mt1300 adapts to glinet SDK4.0 Subject: [PATCH] fix:gl mt1300 adapts to glinet SDK4.0
--- ---
.../ramips/dts/mt7621_glinet_gl-mt1300.dts | 30 ++++++++++++++++--- .../ramips/dts/mt7621_glinet_gl-mt1300.dts | 37 ++++++++++++++++---
target/linux/ramips/image/mt7621.mk | 2 ++ target/linux/ramips/image/mt7621.mk | 2 +
2 files changed, 28 insertions(+), 4 deletions(-) 2 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts diff --git a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
index 384da1bfa9..23c5be89c8 100644 index 7e3dc8cc03..621a010d3f 100644
--- a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts --- a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
+++ b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts +++ b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
@@ -10,13 +10,35 @@ @@ -10,13 +10,35 @@
@ -52,11 +52,25 @@ index 384da1bfa9..23c5be89c8 100644
chosen { chosen {
bootargs = "console=ttyS0,115200"; bootargs = "console=ttyS0,115200";
}; };
@@ -96,7 +118,12 @@
partition@50000 {
compatible = "denx,uimage";
label = "firmware";
- reg = <0x50000 0x1fb0000>;
+ reg = <0x50000 0x1f90000>;
+ };
+
+ partition@1ff0000 {
+ label = "log";
+ reg = <0x1fe0000 0x20000>;
};
};
};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 7f903485aa..6c937a2409 100644 index c3e2291a9d..8e45b0b676 100644
--- a/target/linux/ramips/image/mt7621.mk --- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk
@@ -691,7 +691,9 @@ define Device/glinet_gl-mt1300 @@ -721,7 +721,9 @@ define Device/glinet_gl-mt1300
IMAGE_SIZE := 32448k IMAGE_SIZE := 32448k
DEVICE_VENDOR := GL.iNet DEVICE_VENDOR := GL.iNet
DEVICE_MODEL := GL-MT1300 DEVICE_MODEL := GL-MT1300

30
patches-22.03.4/0009-fix-mt1300-dts-add-log-part.patch
View File

@ -1,30 +0,0 @@
From d0df617b77d67c842308d2f04687052c13b46c12 Mon Sep 17 00:00:00 2001
From: gl-dengxinfa <xinfa.deng@gl-inet.com>
Date: Tue, 18 Oct 2022 11:17:31 +0800
Subject: [PATCH] fix: mt1300 dts add log part
---
target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
index c488d72e36..54ff1019b1 100644
--- a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
+++ b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
@@ -119,7 +119,12 @@
partition@50000 {
compatible = "denx,uimage";
label = "firmware";
- reg = <0x50000 0x1fb0000>;
+ reg = <0x50000 0x1f90000>;
+ };
+
+ partition@1ff0000 {
+ label = "log";
+ reg = <0x1fe0000 0x20000>;
};
};
};
--
2.34.1

26
patches-22.03.4/0010-fix-ramips-mtdoops-add-_panic_write.patch
View File

@ -1,23 +1,21 @@
From 03e26f26d9151977c5b7a0aef378d0faddb80086 Mon Sep 17 00:00:00 2001 From 8bbe35ea9f62e35d5efa1966804139544e179649 Mon Sep 17 00:00:00 2001
From: gl-dengxinfa <xinfa.deng@gl-inet.com> From: Xinfa Deng <Xinfa Deng>
Date: Tue, 18 Oct 2022 11:15:45 +0800 Date: Thu, 25 May 2023 15:14:00 +0800
Subject: [PATCH] fix: mtdoops add _panic_write Subject: [PATCH] fix: mtdoops add _panic_write
--- ---
.../patches-5.10/857-mtd-oops-add-panic-write.patch | 13 +++++++++++++ .../hack-5.10/921-mtd-oops-add-panic-write.patch | 11 +++++++++++
1 file changed, 13 insertions(+) 1 file changed, 11 insertions(+)
create mode 100644 target/linux/ramips/patches-5.10/857-mtd-oops-add-panic-write.patch create mode 100644 target/linux/generic/hack-5.10/921-mtd-oops-add-panic-write.patch
diff --git a/target/linux/ramips/patches-5.10/857-mtd-oops-add-panic-write.patch b/target/linux/ramips/patches-5.10/857-mtd-oops-add-panic-write.patch diff --git a/target/linux/generic/hack-5.10/921-mtd-oops-add-panic-write.patch b/target/linux/generic/hack-5.10/921-mtd-oops-add-panic-write.patch
new file mode 100644 new file mode 100644
index 0000000000..50231e50e6 index 0000000000..9da5579eaa
--- /dev/null --- /dev/null
+++ b/target/linux/ramips/patches-5.10/857-mtd-oops-add-panic-write.patch +++ b/target/linux/generic/hack-5.10/921-mtd-oops-add-panic-write.patch
@@ -0,0 +1,13 @@ @@ -0,0 +1,11 @@
+Index: linux-5.10.138/drivers/mtd/spi-nor/core.c +--- a/drivers/mtd/spi-nor/core.c
+=================================================================== ++++ b/drivers/mtd/spi-nor/core.c
+--- linux-5.10.138.orig/drivers/mtd/spi-nor/core.c
++++ linux-5.10.138/drivers/mtd/spi-nor/core.c
+@@ -3207,6 +3207,8 @@ int spi_nor_scan(struct spi_nor *nor, co +@@ -3207,6 +3207,8 @@ int spi_nor_scan(struct spi_nor *nor, co
+ +
+ mtd->_write = spi_nor_write; + mtd->_write = spi_nor_write;

28
patches-22.03.4/0012-fix-opkg-support-db.patch
View File

@ -1,23 +1,21 @@
From 79d7f61ede3e4e7d5621999c25715dac1cb57a8a Mon Sep 17 00:00:00 2001 From c6464a3fb2b74767d54758639f647860c8aea6c6 Mon Sep 17 00:00:00 2001
From: gl-dengxinfa <xinfa.deng@gl-inet.com> From: gl-dengxinfa <xinfa.deng@gl-inet.com>
Date: Tue, 18 Oct 2022 16:00:38 +0800 Date: Tue, 18 Oct 2022 16:00:38 +0800
Subject: [PATCH] fix: opkg support db Subject: [PATCH] fix: opkg support db
--- ---
.../system/opkg/patches/001-support-db.patch | 88 +++++++++++++++++++ .../system/opkg/patches/001-support-db.patch | 82 +++++++++++++++++++
1 file changed, 88 insertions(+) 1 file changed, 82 insertions(+)
create mode 100644 package/system/opkg/patches/001-support-db.patch create mode 100644 package/system/opkg/patches/001-support-db.patch
diff --git a/package/system/opkg/patches/001-support-db.patch b/package/system/opkg/patches/001-support-db.patch diff --git a/package/system/opkg/patches/001-support-db.patch b/package/system/opkg/patches/001-support-db.patch
new file mode 100644 new file mode 100644
index 0000000000..a38a272425 index 0000000000..a7b9118a5d
--- /dev/null --- /dev/null
+++ b/package/system/opkg/patches/001-support-db.patch +++ b/package/system/opkg/patches/001-support-db.patch
@@ -0,0 +1,88 @@ @@ -0,0 +1,82 @@
+Index: opkg-2022-02-24-d038e5b6/libopkg/opkg_cmd.c +--- a/libopkg/opkg_cmd.c
+=================================================================== ++++ b/libopkg/opkg_cmd.c
+--- opkg-2022-02-24-d038e5b6.orig/libopkg/opkg_cmd.c
++++ opkg-2022-02-24-d038e5b6/libopkg/opkg_cmd.c
+@@ -44,6 +44,29 @@ +@@ -44,6 +44,29 @@
+ int opkg_cli_argc = 0; + int opkg_cli_argc = 0;
+ const char **opkg_cli_argv = NULL; + const char **opkg_cli_argv = NULL;
@ -76,10 +74,8 @@ index 0000000000..a38a272425
+ return err; + return err;
+ } + }
+ +
+Index: opkg-2022-02-24-d038e5b6/libopkg/opkg_install.c +--- a/libopkg/opkg_install.c
+=================================================================== ++++ b/libopkg/opkg_install.c
+--- opkg-2022-02-24-d038e5b6.orig/libopkg/opkg_install.c
++++ opkg-2022-02-24-d038e5b6/libopkg/opkg_install.c
+@@ -1151,7 +1151,7 @@ static int resolve_conffiles(pkg_t * pkg +@@ -1151,7 +1151,7 @@ static int resolve_conffiles(pkg_t * pkg
+ char *new_conffile; + char *new_conffile;
+ sprintf_alloc(&new_conffile, "%s-opkg", + sprintf_alloc(&new_conffile, "%s-opkg",
@ -89,10 +85,8 @@ index 0000000000..a38a272425
+ "Existing conffile %s " + "Existing conffile %s "
+ "is different from the conffile in the new package." + "is different from the conffile in the new package."
+ " The new conffile will be placed at %s.\n", + " The new conffile will be placed at %s.\n",
+Index: opkg-2022-02-24-d038e5b6/libopkg/pkg.c +--- a/libopkg/pkg.c
+=================================================================== ++++ b/libopkg/pkg.c
+--- opkg-2022-02-24-d038e5b6.orig/libopkg/pkg.c
++++ opkg-2022-02-24-d038e5b6/libopkg/pkg.c
+@@ -1409,7 +1409,7 @@ int pkg_run_script(pkg_t * pkg, const ch +@@ -1409,7 +1409,7 @@ int pkg_run_script(pkg_t * pkg, const ch
+ return 0; + return 0;
+ } + }