Skip to content

Commit 76e9297

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: build: add support for python3.11 and higher (coolsnowwolf#10392) Update README.md
2 parents 8d6830a + a18b6cf commit 76e9297

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
## 官方讨论群
66
如有技术问题需要讨论或者交流,欢迎加入以下群:
7-
1. QQ 讨论群: Op固件技术研究群 ,号码 891659613 ,加群链接:[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群")
7+
1. QQ 讨论群: Op固件技术研究群-2 号码 618992230 ,加群链接:[点击加入](https://jq.qq.com/?_wv=1027&k=Imt01vqy "Op固件技术研究群-2")
8+
Op固件技术研究群 ,号码 891659613 ,加群链接:[点击加入](https://jq.qq.com/?_wv=1027&k=XL8SK5aC "Op固件技术研究群")
89
2. TG 讨论群: OP 编译官方大群 ,加群链接:[点击加入](https://t.me/JhKgAA6Hx1 "OP 编译官方大群")
910
3. Rockchip RK3568 预编译固件发布 Release 下载更新地址 (包括 H68K ):<https://github.com/coolsnowwolf/lede/releases/tag/20220716>
1011

include/prereq-build.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -157,20 +157,22 @@ $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
157157
$(eval $(call CleanupPython2))
158158

159159
$(eval $(call SetupHostCommand,python,Please install Python >= 3.6, \
160+
python3.11 -V 2>&1 | grep 'Python 3', \
160161
python3.10 -V 2>&1 | grep 'Python 3', \
161162
python3.9 -V 2>&1 | grep 'Python 3', \
162163
python3.8 -V 2>&1 | grep 'Python 3', \
163164
python3.7 -V 2>&1 | grep 'Python 3', \
164165
python3.6 -V 2>&1 | grep 'Python 3', \
165-
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|10)\.?'))
166+
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
166167

167168
$(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \
169+
python3.11 -V 2>&1 | grep 'Python 3', \
168170
python3.10 -V 2>&1 | grep 'Python 3', \
169171
python3.9 -V 2>&1 | grep 'Python 3', \
170172
python3.8 -V 2>&1 | grep 'Python 3', \
171173
python3.7 -V 2>&1 | grep 'Python 3', \
172174
python3.6 -V 2>&1 | grep 'Python 3', \
173-
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|10)\.?'))
175+
python3 -V 2>&1 | grep -E 'Python 3\.([6-9]|[0-9][0-9])\.?'))
174176

175177
$(eval $(call TestHostCommand,python3-distutils, \
176178
Please install the Python3 distutils module, \

0 commit comments

Comments
 (0)