Skip to content

Commit d364046

Browse files
SuLingGGSuLingGG
committed
Add en_us & zh_tw translations
Use luci-app-flowoffload to replace luci-app-sfe for rpi4 Disable autostart for luci-udptools
1 parent e1a74ba commit d364046

28 files changed

+65
-9
lines changed

‎.github/workflows/build-gdock-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ jobs:
133133
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
134134
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
135135
cd $OPENWRTROOT
136+
mkdir -p files/etc/uci-defaults/
137+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
136138
mkdir -p files/etc/opkg
137139
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
138140
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-gdock-project-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ jobs:
133133
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
134134
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
135135
cd $OPENWRTROOT
136+
mkdir -p files/etc/uci-defaults/
137+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
136138
mkdir -p files/etc/opkg
137139
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
138140
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-r2s-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ jobs:
133133
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
134134
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
135135
cd $OPENWRTROOT
136+
mkdir -p files/etc/uci-defaults/
137+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
136138
mkdir -p files/etc/opkg
137139
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
138140
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi1-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ jobs:
134134
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
135135
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
136136
cd $OPENWRTROOT
137+
mkdir -p files/etc/uci-defaults/
138+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
137139
mkdir -p files/etc/opkg
138140
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
139141
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi1-offical-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ jobs:
136136
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
137137
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
138138
cd $OPENWRTROOT
139+
mkdir -p files/etc/uci-defaults/
140+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
139141
mkdir -p files/etc/opkg
140142
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
141143
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi2-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ jobs:
134134
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
135135
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
136136
cd $OPENWRTROOT
137+
mkdir -p files/etc/uci-defaults/
138+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
137139
mkdir -p files/etc/opkg
138140
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
139141
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi2-offical-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ jobs:
136136
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
137137
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
138138
cd $OPENWRTROOT
139+
mkdir -p files/etc/uci-defaults/
140+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
139141
mkdir -p files/etc/opkg
140142
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
141143
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi3-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ jobs:
134134
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
135135
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
136136
cd $OPENWRTROOT
137+
mkdir -p files/etc/uci-defaults/
138+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
137139
mkdir -p files/etc/opkg
138140
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
139141
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi3-offical-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ jobs:
136136
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
137137
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
138138
cd $OPENWRTROOT
139+
mkdir -p files/etc/uci-defaults/
140+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
139141
mkdir -p files/etc/opkg
140142
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
141143
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi4-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ jobs:
136136
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
137137
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
138138
cd $OPENWRTROOT
139+
mkdir -p files/etc/uci-defaults/
140+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
139141
mkdir -p files/etc/opkg
140142
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
141143
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-rpi4-offical-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ jobs:
137137
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
138138
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
139139
cd $OPENWRTROOT
140+
mkdir -p files/etc/uci-defaults/
141+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
140142
mkdir -p files/etc/opkg
141143
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
142144
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-x86_64-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ jobs:
134134
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
135135
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
136136
cd $OPENWRTROOT
137+
mkdir -p files/etc/uci-defaults/
138+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
137139
mkdir -p files/etc/opkg
138140
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
139141
if "$KMODS_IN_FIRMWARE" = 'true'

‎.github/workflows/build-x86_generic-lean-openwrt.yml

+2
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ jobs:
134134
sed -i "s/target\//$TARGET\//g" distfeeds*.conf
135135
sed -i "s/platform/$PLATFORM/g" distfeeds*.conf
136136
cd $OPENWRTROOT
137+
mkdir -p files/etc/uci-defaults/
138+
cp ../scripts/init-settings.sh files/etc/uci-defaults/99-init-settings
137139
mkdir -p files/etc/opkg
138140
cp ../data/opkg/distfeeds-packages-server.conf files/etc/opkg/distfeeds.conf.server
139141
if "$KMODS_IN_FIRMWARE" = 'true'

‎config/lean/bcm27xx/rpi-lean-extra.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ CONFIG_PACKAGE_luci-app-dockerman=y
132132
CONFIG_PACKAGE_luci-app-familycloud=y
133133
CONFIG_PACKAGE_luci-app-fileassistant=y
134134
CONFIG_PACKAGE_luci-app-filebrowser=y
135-
CONFIG_PACKAGE_luci-app-flowoffload=n
136135
CONFIG_PACKAGE_luci-app-frpc=y
137136
CONFIG_PACKAGE_luci-app-frps=y
138137
CONFIG_PACKAGE_luci-app-gowebdav=y
@@ -179,7 +178,6 @@ CONFIG_PACKAGE_luci-app-ps3netsrv=y
179178
CONFIG_PACKAGE_luci-app-rclone=y
180179
CONFIG_PACKAGE_luci-app-samba=y
181180
CONFIG_PACKAGE_luci-app-serverchan=y
182-
CONFIG_PACKAGE_luci-app-sfe=y
183181
CONFIG_PACKAGE_luci-app-shairplay=y
184182
CONFIG_PACKAGE_luci-app-smartdns=y
185183
CONFIG_PACKAGE_luci-app-socat=y
@@ -219,6 +217,8 @@ CONFIG_PACKAGE_luci-app-wireguard=y
219217
CONFIG_PACKAGE_luci-app-wrtbwmon=y
220218
CONFIG_PACKAGE_luci-app-xlnetacc=y
221219
CONFIG_PACKAGE_luci-app-zerotier=y
220+
CONFIG_PACKAGE_luci-i18n-base-en=y
221+
CONFIG_PACKAGE_luci-i18n-base-zh-tw=y
222222
CONFIG_PACKAGE_luci-udptools=y
223223
CONFIG_PACKAGE_luci-proto-minieap=y
224224
CONFIG_PACKAGE_luci-proto-bonding=y

‎config/lean/bcm27xx/rpi1-lean-target.config

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
CONFIG_TARGET_bcm27xx=y
22
CONFIG_TARGET_bcm27xx_bcm2708=y
33
CONFIG_TARGET_bcm27xx_bcm2708_DEVICE_rpi=y
4+
CONFIG_PACKAGE_luci-app-sfe=y
5+
CONFIG_PACKAGE_luci-app-flowoffload=n

‎config/lean/bcm27xx/rpi2-lean-target.config

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
CONFIG_TARGET_bcm27xx=y
22
CONFIG_TARGET_bcm27xx_bcm2709=y
33
CONFIG_TARGET_bcm27xx_bcm2709_DEVICE_rpi-2=y
4+
CONFIG_PACKAGE_luci-app-sfe=y
5+
CONFIG_PACKAGE_luci-app-flowoffload=n

‎config/lean/bcm27xx/rpi3-lean-target.config

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ CONFIG_TARGET_bcm27xx_bcm2710=y
33
CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y
44
CONFIG_PACKAGE_luci-app-adbyby-plus=n
55
CONFIG_PACKAGE_luci-app-verysync=y
6+
CONFIG_PACKAGE_luci-app-sfe=y
7+
CONFIG_PACKAGE_luci-app-flowoffload=n

‎config/lean/bcm27xx/rpi4-lean-target.config

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ CONFIG_TARGET_bcm27xx_bcm2711=y
33
CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
44
CONFIG_PACKAGE_luci-app-adbyby-plus=n
55
CONFIG_PACKAGE_luci-app-verysync=y
6+
CONFIG_PACKAGE_luci-app-sfe=n
7+
CONFIG_PACKAGE_luci-app-flowoffload=y

‎config/lean/ipq40xx/gdock-lean-openwrt.config

+3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ CONFIG_PACKAGE_luci-app-mwan3=y
6868
CONFIG_PACKAGE_luci-app-mwan3helper=y
6969
CONFIG_PACKAGE_luci-app-n2n_v2=y
7070
CONFIG_PACKAGE_luci-app-nfs=y
71+
CONFIG_PACKAGE_luci-app-nft-qos=y
7172
CONFIG_PACKAGE_luci-app-nps=y
7273
CONFIG_PACKAGE_luci-app-onliner=y
7374
CONFIG_PACKAGE_luci-app-ntpc=y
@@ -137,6 +138,8 @@ CONFIG_PACKAGE_luci-app-wireguard=y
137138
CONFIG_PACKAGE_luci-app-wrtbwmon=y
138139
CONFIG_PACKAGE_luci-app-xlnetacc=y
139140
CONFIG_PACKAGE_luci-app-zerotier=y
141+
CONFIG_PACKAGE_luci-i18n-base-en=y
142+
CONFIG_PACKAGE_luci-i18n-base-zh-tw=y
140143
CONFIG_PACKAGE_luci-udptools=y
141144
CONFIG_PACKAGE_luci-proto-minieap=y
142145
CONFIG_PACKAGE_luci-proto-bonding=y

‎config/lean/rockchip/r2s-lean-openwrt.config

+2
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ CONFIG_PACKAGE_luci-app-wireguard=y
225225
CONFIG_PACKAGE_luci-app-wrtbwmon=y
226226
CONFIG_PACKAGE_luci-app-xlnetacc=y
227227
CONFIG_PACKAGE_luci-app-zerotier=y
228+
CONFIG_PACKAGE_luci-i18n-base-en=y
229+
CONFIG_PACKAGE_luci-i18n-base-zh-tw=y
228230
CONFIG_PACKAGE_luci-udptools=y
229231
CONFIG_PACKAGE_luci-proto-minieap=y
230232
CONFIG_PACKAGE_luci-proto-bonding=y

‎config/lean/x86/x86-lean-extra.config

+2
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,8 @@ CONFIG_PACKAGE_luci-app-wireguard=y
455455
CONFIG_PACKAGE_luci-app-wrtbwmon=y
456456
CONFIG_PACKAGE_luci-app-xlnetacc=y
457457
CONFIG_PACKAGE_luci-app-zerotier=y
458+
CONFIG_PACKAGE_luci-i18n-base-en=y
459+
CONFIG_PACKAGE_luci-i18n-base-zh-tw=y
458460
CONFIG_PACKAGE_luci-udptools=y
459461
CONFIG_PACKAGE_luci-proto-minieap=y
460462
CONFIG_PACKAGE_luci-proto-bonding=y

‎config/offical/bcm27xx/rpi-offical-extra.config

+2
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,8 @@ CONFIG_PACKAGE_luci-app-wireguard=y
203203
CONFIG_PACKAGE_luci-app-wol=y
204204
CONFIG_PACKAGE_luci-app-xlnetacc=y
205205
CONFIG_PACKAGE_luci-app-zerotier=y
206+
CONFIG_PACKAGE_luci-i18n-base-en=y
207+
CONFIG_PACKAGE_luci-i18n-base-zh-tw=y
206208
CONFIG_PACKAGE_luci-udptools=y
207209
CONFIG_PACKAGE_luci-proto-minieap=y
208210
CONFIG_PACKAGE_luci-proto-bonding=y

‎config/project/ipq40xx/gdock-project-openwrt.config

+2
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ CONFIG_PACKAGE_luci-app-wireguard=y
137137
CONFIG_PACKAGE_luci-app-wrtbwmon=y
138138
CONFIG_PACKAGE_luci-app-xlnetacc=y
139139
CONFIG_PACKAGE_luci-app-zerotier=y
140+
CONFIG_PACKAGE_luci-i18n-base-en=y
141+
CONFIG_PACKAGE_luci-i18n-base-zh-tw=y
140142
CONFIG_PACKAGE_luci-udptools=y
141143
CONFIG_PACKAGE_luci-proto-bonding=y
142144
CONFIG_PACKAGE_luci-proto-ipv6=y

‎scripts/init-settings.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
#=================================================
3+
# File name: init-settings.sh
4+
# Description: This script will be execute during the first boot
5+
# Author: SuLingGG
6+
# Blog: https://mlapp.cn
7+
#=================================================
8+
9+
# Set default theme to luci-theme-argon
10+
uci set luci.main.mediaurlbase='/luci-static/argon'
11+
12+
# Disable luci-udptools autostart
13+
rm -f /etc/rc.d/S98udptools || true
14+
15+
# Try to execute init.sh (if exists)
16+
[ -e /boot/init.sh ] && bash /boot/init.sh
17+
18+
exit 0

‎scripts/ipv6-helper.sh

100644100755
File mode changed.

‎scripts/lean-openwrt.sh

-2
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@ popd
9191

9292
# Mod zzz-default-settings
9393
pushd package/lean/default-settings/files
94-
sed -i "/commit luci/i\uci set luci.main.mediaurlbase='/luci-static/argon'" zzz-default-settings
9594
sed -i '/http/d' zzz-default-settings
96-
sed -i '/exit/i\chmod +x /bin/ipv6-helper' zzz-default-settings
9795
popd
9896

9997
# Fix libssh

‎scripts/offical-openwrt.sh

-2
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ popd
105105

106106
# Mod zzz-default-settings
107107
pushd package/lean/default-settings/files
108-
sed -i "/commit luci/i\uci set luci.main.mediaurlbase='/luci-static/argon'" zzz-default-settings
109108
sed -i '/http/d' zzz-default-settings
110-
sed -i '/exit/i\chmod +x /bin/ipv6-helper' zzz-default-settings
111109
popd
112110

113111
# Mod ipv6-helper.sh

‎scripts/project-openwrt.sh

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ popd
1818
# Remove r8168 driver
1919
rm -rf package/ctcgfw/r8168
2020

21-
# Mod zzz-default-settings
22-
sed -i "/commit luci/i\uci set luci.main.mediaurlbase='/luci-static/argon'" package/lean/default-settings/files/zzz-default-settings
23-
2421
# Add po2lmo
2522
git clone https://github.com/openwrt-dev/po2lmo.git
2623
pushd po2lmo

0 commit comments

Comments
 (0)