mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-02-14 12:21:53 +00:00
Code Issues Releases Wiki Activity

Update OpenWRT

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-05-15 14:07:17 +02:00
parent 73339ce63e
commit 701f816a31
3 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
6.6/target/linux/generic/config-6.6
View file

@ -8264,3 +8264,4 @@ CONFIG_DRM_I915_PREEMPT_TIMEOUT_COMPUTE=7500
# CONFIG_COMMON_CLK_MT8188 is not set
# CONFIG_COMMON_CLK_MEDIATEK_FHCTL is not set
# CONFIG_UACCE is not set
# CONFIG_CPU_MITIGATIONS is not set

12
build.sh
View file

@ -128,9 +128,9 @@ if [ "$OMR_OPENWRT" = "default" ]; then
_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "3ee7b46610e9dbd8fd2bba87bd06024cd0d9c08f"
_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "ddda66aa8caa5e929cf7a542a79e2c3ce69eb66c"
elif [ "$OMR_KERNEL" = "6.6" ] || [ "$OMR_KERNEL" = "6.7" ]; then
_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "84a48ce400b2c7b0779f51e83c68de5f8ec58ffd"
_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "e35b92835ed034ab1309c94b0602f64e4fb8ec67"
_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "50d7a339d3ed8b3ac99bde212ef0181871a6e970"
_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/openwrt/openwrt "4341901f050058aba0f908c775a4d136c311062c"
_get_repo feeds/${OMR_KERNEL}/packages https://github.com/openwrt/packages "f805121318acb6d54fa3b5d80b2ba8d90e40c427"
_get_repo feeds/${OMR_KERNEL}/luci https://github.com/openwrt/luci "08b8b1d0e3bd541d18b66f52b903371dfe38ca95"
fi
elif [ "$OMR_OPENWRT" = "coolsnowwolfmix" ]; then
_get_repo "$OMR_TARGET/${OMR_KERNEL}/source" https://github.com/coolsnowwolf/lede.git "master"
@ -879,6 +879,12 @@ rm -rf feeds/${OMR_KERNEL}/luci/modules/luci-mod-network
if [ -d feeds/${OMR_KERNEL}/${OMR_DIST}/luci-mod-status ]; then
rm -rf feeds/${OMR_KERNEL}/luci/modules/luci-mod-status
elif [ "$OMR_KERNEL" = "6.6" ]; then
cd feeds/${OMR_KERNEL}
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/luci-syslog-6.6.patch; then
patch -N -p1 -s < ../../patches/luci-syslog-6.6-.patch
fi
cd -
else
cd feeds/${OMR_KERNEL}
if ! patch -Rf -N -p1 -s --dry-run < ../../patches/luci-syslog.patch; then

22
patches/luci-syslog-6.6.patch Normal file
View file

@ -0,0 +1,22 @@
--- a/luci/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json 2023-06-29 20:01:01.203922762 +0200
+++ b/luci/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json 2023-06-29 20:01:05.479852745 +0200
@@ -33,7 +33,7 @@
"file": {
"/bin/dmesg -r": [ "exec" ],
"/sbin/logread": [ "stat" ],
- "/sbin/logread -e ^": [ "exec" ],
+ "/sbin/logread": [ "exec" ],
"/usr/sbin/logread": [ "stat" ],
"/usr/sbin/logread -e ^": [ "exec" ]
},
--- a/luci/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js 2024-05-14 17:40:42.933677009 +0200
+++ b/luci/modules/luci-mod-status/htdocs/luci-static/resources/view/status/syslog.js 2024-05-15 13:54:27.933558437 +0200
@@ -12,7 +12,7 @@
]).then(function(stat) {
var logger = stat[0] ? stat[0].path : stat[1] ? stat[1].path : null;
- return fs.exec_direct(logger, [ '-e', '^' ]).then(logdata => {
+ return fs.exec_direct(logger).then(logdata => {
const loglines = logdata.trim().split(/\n/);
return { value: loglines.join('\n'), rows: loglines.length + 1 };
}).catch(function(err) {