Skip to content

Commit d3152f2

Browse files
committed
Pull request #77: Merge v1.1 on develop
Merge in STICKY/overthebox from feature/v1.1 to develop * commit 'b2b2054a671451a16a5ff30ec1e51c09e3bbb6d9': feat: update to openwrt v24.10.0 feat(config): update for openwrt 24.10 feat: update to openwrt 24.10.0-rc7
2 parents f0a3fb7 + b2b2054 commit d3152f2

File tree

10 files changed

+26
-16
lines changed

10 files changed

+26
-16
lines changed

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[submodule "openwrt"]
22
path = openwrt
33
url = https://github.com/ovh/overthebox-lede
4-
branch = otb-mptcp-23.05.5
4+
branch = otb-mptcp-24.10.0-rc7
55
[submodule "feeds/packages"]
66
path = feeds/packages
77
url = https://github.com/openwrt/packages
8-
branch = openwrt-23.05
8+
branch = openwrt-24.10
99
[submodule "feeds/routing"]
1010
path = feeds/routing
1111
url = https://github.com/openwrt-routing/packages
12-
branch = openwrt-23.05
12+
branch = openwrt-24.10
1313
[submodule "feeds/luci"]
1414
path = feeds/luci
1515
url = https://github.com/openwrt/luci
16-
branch = openwrt-23.05
16+
branch = openwrt-24.10
1717
[submodule "feeds/overthebox"]
1818
path = feeds/overthebox
1919
url = ../overthebox-feeds

config/image_busybox

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ CONFIG_BUSYBOX_CONFIG_ARPING=y
33
CONFIG_BUSYBOX_CONFIG_ARP=y
44
CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
55
CONFIG_BUSYBOX_CONFIG_BASE64=y
6+
CONFIG_BUSYBOX_CONFIG_BUNZIP2=y
67
CONFIG_BUSYBOX_CONFIG_BZIP2_SMALL=0
78
CONFIG_BUSYBOX_CONFIG_BZIP2=y
89
CONFIG_BUSYBOX_CONFIG_CHPASSWD=y
910
CONFIG_BUSYBOX_CONFIG_DELUSER=y
1011
CONFIG_BUSYBOX_CONFIG_DIFF=y
1112
# CONFIG_BUSYBOX_CONFIG_DMESG is not set
13+
CONFIG_BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS=y
1214
CONFIG_BUSYBOX_CONFIG_FEATURE_DATE_NANO=y
1315
CONFIG_BUSYBOX_CONFIG_FEATURE_DIFF_DIR=y
1416
CONFIG_BUSYBOX_CONFIG_FEATURE_PS_LONG=y

config/kmod_network

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ CONFIG_PACKAGE_kmod-i40e=y
2727
CONFIG_PACKAGE_kmod-iavf=y
2828
CONFIG_PACKAGE_kmod-igbvf=y
2929
CONFIG_PACKAGE_kmod-igc=y
30+
CONFIG_PACKAGE_kmod-inet-diag=y
31+
CONFIG_PACKAGE_kmod-inet-mptcp-diag=y
3032
CONFIG_PACKAGE_kmod-ipvlan=y
3133
CONFIG_PACKAGE_kmod-ixgbevf=y
3234
CONFIG_PACKAGE_kmod-ixgbe=y
@@ -37,6 +39,8 @@ CONFIG_PACKAGE_kmod-ne2k-pci=y
3739
CONFIG_PACKAGE_kmod-niu=y
3840
CONFIG_PACKAGE_kmod-of-mdio=y
3941
CONFIG_PACKAGE_kmod-pcnet32=y
42+
CONFIG_PACKAGE_kmod-phy-airoha-en8811h=y
43+
CONFIG_PACKAGE_kmod-phy-amd=y
4044
CONFIG_PACKAGE_kmod-phy-aquantia=y
4145
CONFIG_PACKAGE_kmod-phy-bcm84881=y
4246
CONFIG_PACKAGE_kmod-phy-broadcom=y

config/package_include

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
arp-scan
2+
arp-scan-database
3+
bash
14
bmon
25
bwm-ng
6+
collectd-mod-thermal
37
comgt
48
conntrack
59
conntrackd
@@ -16,15 +20,19 @@ libustream-mbedtls
1620
libzstd
1721
lsblk
1822
lscpu
23+
lsns
24+
luci-app-pbr
1925
luci-proto-modemmanager
2026
luci-proto-qmi
27+
luci-proto-wireguard
2128
mini_snmpd
2229
modemmanager
2330
mtr
2431
nano
2532
netcat
2633
nstat
2734
openssh-sftp-server
35+
pbr
2836
pciutils
2937
px5g-mbedtls
3038
python3-light
@@ -43,3 +51,4 @@ usb-modeswitch
4351
usbmuxd
4452
usbutils
4553
vim-fuller
54+
wireguard-tools

config/package_optionnal

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
arp-scan
2-
arp-scan-database
31
collectd-mod-conntrack
42
collectd-mod-cpufreq
53
collectd-mod-df
@@ -32,15 +30,13 @@ collectd-mod-sqm
3230
collectd-mod-swap
3331
collectd-mod-syslog
3432
collectd-mod-tcpconns
35-
collectd-mod-thermal
3633
collectd-mod-uptime
3734
collectd-mod-write-graphite
3835
collectd-mod-write-http
36+
dnsmasq-full
3937
kmod-pcengines-apuv2
40-
luci-app-pbr
41-
luci-proto-wireguard
38+
llpd
4239
minicom
43-
pbr
4440
prometheus-node-exporter-lua
4541
prometheus-node-exporter-lua-hwmon
4642
prometheus-node-exporter-lua-nat_traffic
@@ -58,4 +54,3 @@ snmptrapd
5854
snmp-utils
5955
speedtest-netperf
6056
swconfig
61-
wireguard-tools

feeds/luci

Submodule luci updated 3544 files

feeds/overthebox

Submodule overthebox updated 29 files

feeds/packages

Submodule packages updated 1985 files

feeds/routing

openwrt

Submodule openwrt updated 9681 files

0 commit comments

Comments
 (0)