Skip to content

Commit 97c7775

Browse files
AxelDumAxelDum
committed
feat: openwrt 23.05.5
1 parent 1e10e61 commit 97c7775

15 files changed

+38
-34
lines changed

Diff for: ‎build.sh

+1-9
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ unset GREP_OPTIONS SED
77

88
OTB_ARCH=${OTB_ARCH:-x86_64}
99

10-
OTB_CONFIG_FILES=${OTB_CONFIG_FILES:-image_common image_busybox kmod_common kmod_network kmod_usb "arch_${OTB_ARCH}"}
11-
OTB_CONFIG_LUCI_LANGS=$(cat "config/luci_languages")
10+
OTB_CONFIG_FILES=${OTB_CONFIG_FILES:-image_common image_busybox image_i18n kmod_common kmod_network kmod_usb "arch_${OTB_ARCH}"}
1211
OTB_PKGS_INCLUDE=$(cat "config/package_include")
1312
OTB_PKGS_OVERTHEBOX=$(cat "config/package_overthebox")
1413
OTB_PKGS_OPTIONNAL=$(cat "config/package_optionnal")
@@ -67,7 +66,6 @@ EOF
6766

6867
cat > openwrt/.config <<EOF
6968
$(for i in $OTB_CONFIG_FILES; do cat "config/$i"; done)
70-
$(for i in $OTB_CONFIG_LUCI_LANGS; do echo "CONFIG_LUCI_LANG_$i=y"; done)
7169
CONFIG_VERSION_DIST="$OTB_VERSION_DIST"
7270
CONFIG_VERSION_REPO="$OTB_VERSION_REPO"
7371
CONFIG_VERSION_NUMBER="$OTB_VERSION_SYSTEM"
@@ -99,13 +97,7 @@ if [ -n "${OTB_PKGS_OPTIONNAL}" ]; then
9997
scripts/feeds install -d m ${OTB_PKGS_OPTIONNAL}
10098
fi
10199

102-
# Get i18n packages to ensure Web translation
103-
for lang in $OTB_CONFIG_LUCI_LANGS ; do
104-
OTB_PKGS_I18N=$(printf "%s\n%s" "$OTB_PKGS_I18N" "$(grep "luci-i18n-\w*-$lang" .config)")
105-
done
106-
107100
cp .config.keep .config
108-
echo "$OTB_PKGS_I18N" >> .config
109101

110102
make defconfig
111103
if ! make "$@"; then

Diff for: ‎config/arch_rpi3

-3
This file was deleted.

Diff for: ‎config/arch_x86

-5
This file was deleted.

Diff for: ‎config/image_busybox

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
CONFIG_BUSYBOX_CUSTOM=y
21
CONFIG_BUSYBOX_CONFIG_ADDUSER=y
3-
CONFIG_BUSYBOX_CONFIG_ARP=y
42
CONFIG_BUSYBOX_CONFIG_ARPING=y
3+
CONFIG_BUSYBOX_CONFIG_ARP=y
54
CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
65
CONFIG_BUSYBOX_CONFIG_BASE64=y
7-
CONFIG_BUSYBOX_CONFIG_BZIP2=y
86
CONFIG_BUSYBOX_CONFIG_BZIP2_SMALL=0
7+
CONFIG_BUSYBOX_CONFIG_BZIP2=y
98
CONFIG_BUSYBOX_CONFIG_CHPASSWD=y
109
CONFIG_BUSYBOX_CONFIG_DELUSER=y
1110
CONFIG_BUSYBOX_CONFIG_DIFF=y
11+
# CONFIG_BUSYBOX_CONFIG_DMESG is not set
1212
CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO=y
1313
CONFIG_BUSYBOX_CONFIG_FEATURE_DIFF_DIR=y
1414
CONFIG_BUSYBOX_CONFIG_FEATURE_PS_LONG=y
@@ -18,12 +18,12 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_SEAMLESS_Z=y
1818
CONFIG_BUSYBOX_CONFIG_FEATURE_SHOW_THREADS=y
1919
CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FILESYSTEM=y
2020
CONFIG_BUSYBOX_CONFIG_FEATURE_STAT_FORMAT=y
21+
CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y
2122
CONFIG_BUSYBOX_CONFIG_FEATURE_TAR_AUTODETECT=y
2223
CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS=y
2324
CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU=y
2425
CONFIG_BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS=y
2526
CONFIG_BUSYBOX_CONFIG_FEATURE_USE_TERMIOS=y
26-
CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y
2727
CONFIG_BUSYBOX_CONFIG_HOSTNAME=y
2828
CONFIG_BUSYBOX_CONFIG_IOSTAT=y
2929
CONFIG_BUSYBOX_CONFIG_LOADKMAP=y
@@ -38,6 +38,6 @@ CONFIG_BUSYBOX_CONFIG_STTY=y
3838
CONFIG_BUSYBOX_CONFIG_TELNET=y
3939
CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
4040
CONFIG_BUSYBOX_CONFIG_UNZIP=y
41-
CONFIG_BUSYBOX_CONFIG_WATCH=y
4241
# CONFIG_BUSYBOX_CONFIG_VI is not set
43-
# CONFIG_BUSYBOX_CONFIG_DMESG is not set
42+
CONFIG_BUSYBOX_CONFIG_WATCH=y
43+
CONFIG_BUSYBOX_CUSTOM=y

Diff for: ‎config/image_i18n

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CONFIG_LUCI_LANG_en=y
2+
CONFIG_LUCI_LANG_fr=y

Diff for: ‎config/kmod_common

+8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1+
CONFIG_PACKAGE_ebtables-nft=y
12
CONFIG_PACKAGE_kmod-8021q=y
23
CONFIG_PACKAGE_kmod-arptables=y
34
CONFIG_PACKAGE_kmod-ata-ahci=y
45
CONFIG_PACKAGE_kmod-ata-core=y
56
CONFIG_PACKAGE_kmod-block2mtd=y
67
CONFIG_PACKAGE_kmod-bridge=y
78
CONFIG_PACKAGE_kmod-br-netfilter=y
9+
CONFIG_PACKAGE_kmod-crypto-blake2b=y
810
CONFIG_PACKAGE_kmod-crypto-cbc=y
911
CONFIG_PACKAGE_kmod-crypto-ccm=y
1012
CONFIG_PACKAGE_kmod-crypto-chacha20poly1305=y
1113
CONFIG_PACKAGE_kmod-crypto-ctr=y
14+
CONFIG_PACKAGE_kmod-cryptodev=y
15+
CONFIG_PACKAGE_kmod-crypto-ecdh=y
1216
CONFIG_PACKAGE_kmod-crypto-gcm=y
1317
CONFIG_PACKAGE_kmod-crypto-gf128=y
1418
CONFIG_PACKAGE_kmod-crypto-ghash=y
@@ -17,6 +21,7 @@ CONFIG_PACKAGE_kmod-crypto-rsa=y
1721
CONFIG_PACKAGE_kmod-crypto-seqiv=y
1822
CONFIG_PACKAGE_kmod-crypto-sha1=y
1923
CONFIG_PACKAGE_kmod-crypto-sha512=y
24+
CONFIG_PACKAGE_kmod-crypto-user=y
2025
CONFIG_PACKAGE_kmod-ebtables-ipv4=y
2126
CONFIG_PACKAGE_kmod-ebtables-ipv6=y
2227
CONFIG_PACKAGE_kmod-ebtables=y
@@ -38,6 +43,8 @@ CONFIG_PACKAGE_kmod-input-evdev=y
3843
CONFIG_PACKAGE_kmod-lib-zstd=y
3944
CONFIG_PACKAGE_kmod-loop=y
4045
CONFIG_PACKAGE_kmod-macsec=y
46+
CONFIG_PACKAGE_kmod-mhi-bus=y
47+
CONFIG_PACKAGE_kmod-mhi-pci-generic=y
4148
CONFIG_PACKAGE_kmod-mmc-spi=y
4249
CONFIG_PACKAGE_kmod-mmc=y
4350
CONFIG_PACKAGE_kmod-mux-core=y
@@ -60,6 +67,7 @@ CONFIG_PACKAGE_kmod-nft-tproxy=y
6067
CONFIG_PACKAGE_kmod-nft-xfrm=y
6168
CONFIG_PACKAGE_kmod-nvme=y
6269
CONFIG_PACKAGE_kmod-random-core=y
70+
CONFIG_PACKAGE_kmod-sched-connmark=y
6371
CONFIG_PACKAGE_kmod-scsi-core=y
6472
CONFIG_PACKAGE_kmod-sctp=y
6573
CONFIG_PACKAGE_kmod-sdhci=y

Diff for: ‎config/kmod_network

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ CONFIG_PACKAGE_kmod-phy-microchip=y
4747
CONFIG_PACKAGE_kmod-ppfe=y
4848
CONFIG_PACKAGE_kmod-qlcnic=y
4949
CONFIG_PACKAGE_kmod-r6040=y
50+
CONFIG_PACKAGE_kmod-r8101=y
51+
CONFIG_PACKAGE_kmod-r8125=y
52+
CONFIG_PACKAGE_kmod-r8126=y
53+
CONFIG_PACKAGE_kmod-r8168=y
5054
CONFIG_PACKAGE_kmod-r8169=y
5155
CONFIG_PACKAGE_kmod-sfc-falcon=y
5256
CONFIG_PACKAGE_kmod-sfc=y
@@ -72,3 +76,4 @@ CONFIG_PACKAGE_kmod-veth=y
7276
CONFIG_PACKAGE_kmod-via-rhine=y
7377
CONFIG_PACKAGE_kmod-via-velocity=y
7478
CONFIG_PACKAGE_kmod-vmxnet3=y
79+
CONFIG_PACKAGE_kmod-wwan=y

Diff for: ‎config/luci_languages

-2
This file was deleted.

Diff for: ‎config/package_include

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ conntrack
55
conntrackd
66
dmesg
77
dnsmasq
8-
ethtool
8+
ethtool-full
99
fuse-utils
1010
gdb
1111
htop
@@ -23,20 +23,23 @@ modemmanager
2323
mtr
2424
nano
2525
netcat
26+
nstat
2627
openssh-sftp-server
2728
pciutils
2829
px5g-mbedtls
2930
python3-light
3031
qmi-utils
3132
rng-tools
33+
rpcd-mod-rpcsys
3234
rsync
3335
screen
36+
setterm
3437
ss
3538
strace
3639
sysstat
3740
tc
38-
tcpdump-mini
41+
tcpdump
3942
usb-modeswitch
4043
usbmuxd
4144
usbutils
42-
vim-full
45+
vim-fuller

Diff for: ‎config/package_optionnal

+6
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,19 @@ collectd-mod-write-http
3939
kmod-pcengines-apuv2
4040
minicom
4141
prometheus-node-exporter-lua
42+
prometheus-node-exporter-lua-hwmon
4243
prometheus-node-exporter-lua-nat_traffic
4344
prometheus-node-exporter-lua-netstat
4445
prometheus-node-exporter-lua-openwrt
4546
prometheus-node-exporter-lua-snmp6
4647
prometheus-node-exporter-lua-textfile
48+
prometheus-node-exporter-lua-thermal
4749
prometheus-node-exporter-lua-uci_dhcp_host
4850
prometheus-node-exporter-lua-wifi
4951
prometheus-node-exporter-lua-wifi_stations
5052
python3
53+
snmpd
54+
snmptrapd
55+
snmp-utils
5156
speedtest-netperf
57+
swconfig

Diff for: ‎config/package_overthebox

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ luci-mod-overthebox
22
otb-autoroute
33
otb-backup
44
otb-diagnostics
5-
otb-dscp
65
otb-leds
7-
otb-qos
86
otb-remote
97
otb-tracker

Diff for: ‎feeds/luci

Submodule luci updated 911 files

Diff for: ‎feeds/packages

Submodule packages updated 383 files

Diff for: ‎feeds/routing

Diff for: ‎openwrt

Submodule openwrt updated 1226 files

0 commit comments

Comments
 (0)