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

merge profile

Browse Source
This commit is contained in:
gl-luochongjun 2022-12-13 19:26:15 +08:00
commit d1b69ca20c
6 changed files with 107 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patches-22.03.2/0011-feat-enable-2.4g-vht.patch
View File

@ -1,4 +1,4 @@
From 06476a2c422a9c88678568d9e305c201dd9641e3 Mon Sep 17 00:00:00 2001
From e143d19401fb421105a811984e631db9b80f3a0f Mon Sep 17 00:00:00 2001
From: gl-dengxinfa <xinfa.deng@gl-inet.com>
Date: Tue, 18 Oct 2022 11:20:01 +0800
Subject: [PATCH] feat: enable 2.4g vht
@ -94,15 +94,15 @@ index 0000000000..0c8bd53db7
+ have_80mhz = true;
diff --git a/package/kernel/mt76/patches/001-allow-VHT-rate-on-2.4GHz.patch b/package/kernel/mt76/patches/001-allow-VHT-rate-on-2.4GHz.patch
new file mode 100644
index 0000000000..c063a6f78f
index 0000000000..a334e98550
--- /dev/null
+++ b/package/kernel/mt76/patches/001-allow-VHT-rate-on-2.4GHz.patch
@@ -0,0 +1,47 @@
+Index: mt76-2022-08-26-5ec78e1e/mac80211.c
+Index: mt76-2022-09-06-d7054646/mac80211.c
+===================================================================
+--- mt76-2022-08-26-5ec78e1e.orig/mac80211.c
++++ mt76-2022-08-26-5ec78e1e/mac80211.c
+@@ -274,7 +274,7 @@ static void mt76_init_stream_cap(struct
+--- mt76-2022-09-06-d7054646.orig/mac80211.c
++++ mt76-2022-09-06-d7054646/mac80211.c
+@@ -275,7 +275,7 @@ static void mt76_init_stream_cap(struct
+ void mt76_set_stream_caps(struct mt76_phy *phy, bool vht)
+ {
+ if (phy->cap.has_2ghz)
@ -111,7 +111,7 @@ index 0000000000..c063a6f78f
+ if (phy->cap.has_5ghz)
+ mt76_init_stream_cap(phy, &phy->sband_5g.sband, vht);
+ if (phy->cap.has_6ghz)
+@@ -341,13 +341,13 @@ mt76_init_sband(struct mt76_phy *phy, st
+@@ -342,13 +342,13 @@ mt76_init_sband(struct mt76_phy *phy, st
+
+ static int
+ mt76_init_sband_2g(struct mt76_phy *phy, struct ieee80211_rate *rates,
@ -127,7 +127,7 @@ index 0000000000..c063a6f78f
+ }
+
+ static int
+@@ -495,7 +495,7 @@ int mt76_register_phy(struct mt76_phy *p
+@@ -496,7 +496,7 @@ int mt76_register_phy(struct mt76_phy *p
+ return ret;
+
+ if (phy->cap.has_2ghz) {
@ -136,7 +136,7 @@ index 0000000000..c063a6f78f
+ if (ret)
+ return ret;
+ }
+@@ -620,7 +620,7 @@ int mt76_register_device(struct mt76_dev
+@@ -621,7 +621,7 @@ int mt76_register_device(struct mt76_dev
+ return ret;
+
+ if (phy->cap.has_2ghz) {
@ -146,7 +146,7 @@ index 0000000000..c063a6f78f
+ return ret;
+ }
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 3f24fd5e44..a4a8b9f5bb 100644
index e32ed5846d..2e27e28e8a 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -104,7 +104,7 @@ hostapd_common_add_device_config() {

67
patches-22.03.2/0026--mt1300-configure-dbdc-in-dts.patch Normal file
View File

@ -0,0 +1,67 @@
From 8404956f020d1641295ce6371f8c7dc119f9b59c Mon Sep 17 00:00:00 2001
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
Date: Mon, 12 Dec 2022 16:27:27 +0800
Subject: [PATCH] mt1300: configure dbdc in dts
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
---
.../mt76/patches/002-dbdc-configure.patch | 34 +++++++++++++++++++
.../ramips/dts/mt7621_glinet_gl-mt1300.dts | 1 +
2 files changed, 35 insertions(+)
create mode 100644 package/kernel/mt76/patches/002-dbdc-configure.patch
diff --git a/package/kernel/mt76/patches/002-dbdc-configure.patch b/package/kernel/mt76/patches/002-dbdc-configure.patch
new file mode 100644
index 0000000000..a7998097df
--- /dev/null
+++ b/package/kernel/mt76/patches/002-dbdc-configure.patch
@@ -0,0 +1,34 @@
+Index: mt76-2022-09-06-d7054646/mt7615/pci_init.c
+===================================================================
+--- mt76-2022-09-06-d7054646.orig/mt7615/pci_init.c
++++ mt76-2022-09-06-d7054646/mt7615/pci_init.c
+@@ -126,6 +126,7 @@ mt7615_led_set_brightness(struct led_cla
+
+ int mt7615_register_device(struct mt7615_dev *dev)
+ {
++ bool dbdc = false;
+ int ret;
+
+ mt7615_init_device(dev);
+@@ -145,6 +146,12 @@ int mt7615_register_device(struct mt7615
+ if (ret)
+ return ret;
+
++ if (dev->dbdc_support) {
++ dbdc = device_property_present(dev->mt76.dev, "dbdc");
++ if (dbdc)
++ dev->mt76.phy.cap.has_5ghz = false;
++ }
++
+ ret = mt76_register_device(&dev->mt76, true, mt76_rates,
+ ARRAY_SIZE(mt76_rates));
+ if (ret)
+@@ -158,7 +165,7 @@ int mt7615_register_device(struct mt7615
+ mt7615_init_txpower(dev, &dev->mphy.sband_2g.sband);
+ mt7615_init_txpower(dev, &dev->mphy.sband_5g.sband);
+
+- if (dev->dbdc_support) {
++ if (dev->dbdc_support && dbdc) {
+ ret = mt7615_register_ext_phy(dev);
+ if (ret)
+ return ret;
diff --git a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
index 54ff1019b1..5662600a62 100644
--- a/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
+++ b/target/linux/ramips/dts/mt7621_glinet_gl-mt1300.dts
@@ -139,6 +139,7 @@
compatible = "mediatek,mt76";
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x0>;
+ dbdc;
};
};
--
2.34.1

0
0021-kernel-fix-missing-symbol.patch → patches-wlan-ap/openwrt/0021-kernel-fix-missing-symbol.patch
View File

25
patches-wlan-ap/openwrt/0022-gcc-fix-build-fail-on-ubuntu-22.04.patch Normal file
View File

@ -0,0 +1,25 @@
From 28c1868c680e7e5d09f64b34a999c6f23da247cb Mon Sep 17 00:00:00 2001
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
Date: Sat, 10 Dec 2022 21:41:51 +0800
Subject: [PATCH] gcc: fix build fail on ubuntu-22.04
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
---
toolchain/gcc/common.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk
index d9372f9961..c436429c63 100644
--- a/toolchain/gcc/common.mk
+++ b/toolchain/gcc/common.mk
@@ -94,6 +94,7 @@ GCC_CONFIGURE:= \
CFLAGS="-O2 -fbracket-depth=512 -pipe" \
CXXFLAGS="-O2 -fbracket-depth=512 -pipe" \
) \
+ CXXFLAGS=--std=c++14 \
$(HOST_SOURCE_DIR)/configure \
--with-bugurl=$(BUGURL) \
--with-pkgversion="$(PKGVERSION)" \
--
2.34.1

6
profiles/glinet_mt2500.yml
View File

@ -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: 5ccc76ac86e1e008c885bdd18ea810eb75f4c623
revision: 0cb2cbc95e70a3872a3ec8bb9757b9a64d986ab3
- name: mt7981
uri: https://gitlab.com/gl.sdk4.0/gl.router/mt7981-feeds.git
revision: d71aa8cfd5719994b6b0ab1b7d352c5d39b2eb23
revision: 9c0cc6ca1e6aba94c7818583fc619535600ee7d1
packages:
- kmod-usb-storage
@ -52,6 +52,7 @@ packages:
- gl-sdk4-mwan3
- gl-sdk4-zerotier
- gl-sdk4-cloud-batch-manage
- gl-sdk4-tailscale
- kmod-gl-sdk4-parental-control
- gl-sdk4-ui-adguardhome
@ -97,7 +98,6 @@ packages:
- gl-sdk4-tailscale
- gl-sdk4-ui-tailscaleview
diffconfig: |
CONFIG_SIGNATURE_CHECK=n
CONFIG_PACKAGE_dnsmasq=n

3
profiles/target_mt7981_gl-mt2500.yml
View File

@ -10,9 +10,10 @@ feeds:
branch: common
- name: gl_feed_21_02
uri: https://github.com/gl-inet/gl-feeds.git
revision: 032786d5ff300ebdd83fb1b5fec5344b3da04953
revision: 6b4d34ac72719c22de6e2c365b476e5e9bef18ca
packages:
- tailscale
- fwdd
- mii_mgr
- losetup