Skip to content

Commit 89d627d

Browse files
maurerlemaurerle
committed
use new image-customization-helper
1 parent c5a6080 commit 89d627d

File tree

3 files changed

+374
-74
lines changed

3 files changed

+374
-74
lines changed

‎image-customization-helper.lua

Lines changed: 225 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,225 @@
1+
#!/usr/bin/lua
2+
has_usb = false
3+
if device('cudy-wr1300-v1',
4+
'ravpower-rp-wd009',
5+
'enterasys-ws-ap3715i',
6+
'd-link-dir-860l-b1',
7+
'd-link-dir-882-a1',
8+
'd-link-dir-505',
9+
'gl.inet-gl-mt1300',
10+
'gl.inet-gl-xe300',
11+
'gl.inet-gl-usb150',
12+
'gl.inet-gl-ar150',
13+
'gl.inet-vixmini',
14+
'gl.inet-gl-b1300',
15+
'gl.inet-gl-ar750',
16+
'gl.inet-gl-mt3000',
17+
'gl.inet-gl-ar300m-lite',
18+
'devolo-wifi-pro-1750e',
19+
'onion-omega',
20+
'asus-tuf-ax4200',
21+
'asus-rt-ac51u',
22+
'asus-tuf-ax6000',
23+
'asus-rt-ax53u',
24+
'linksys-wrt1200ac',
25+
'aerohive-hiveap-330',
26+
'netgear-wndr3800',
27+
'netgear-wndrmac-v2',
28+
'netgear-wndr3700-v2',
29+
'netgear-wndr3700-v5',
30+
'netgear-wndr3700-v4',
31+
'netgear-r6260',
32+
'netgear-r6120',
33+
'netgear-dgn3500b',
34+
'netgear-r6220',
35+
'extreme-networks-ws-ap3825i',
36+
'8devices-jalapeno',
37+
'lemaker-banana-pro',
38+
'ocedo-panda',
39+
'aruba-ap-303h',
40+
'aruba-ap-365',
41+
'avm-fritz-box-7360-v2',
42+
'avm-fritz-box-4040',
43+
'avm-fritz-box-4020',
44+
'avm-fritz-box-7530',
45+
'xiaomi-mi-router-4c',
46+
'tp-link-archer-c7-v5',
47+
'tp-link-archer-d50-v1',
48+
'tp-link-tl-wr1043nd-v3',
49+
'tp-link-tl-wr842n-v3',
50+
'tp-link-tl-wr902ac-v1',
51+
'tp-link-tl-mr3420-v5',
52+
'tp-link-archer-c50-v3',
53+
'tp-link-archer-c7-v4',
54+
'tp-link-tl-wr1043nd-v4',
55+
'tp-link-tl-wr1043nd-v2',
56+
'tp-link-tl-wr902ac-v3',
57+
'tp-link-archer-a7-v5',
58+
'tp-link-tl-wdr4900-v1',
59+
'tp-link-td-w8980',
60+
'tp-link-tl-mr3020-v3',
61+
'tp-link-archer-c2600',
62+
'tp-link-tl-wdr3600-v1',
63+
'tp-link-archer-c59-v1',
64+
'tp-link-tl-wdr3500-v1',
65+
'zyxel-nbg6617',
66+
'buffalo-wzr-600dhp',
67+
'plasma-cloud-pa1200') then
68+
has_usb = true
69+
end
70+
71+
has_lte = false
72+
if device('zte-mf281',
73+
'zte-mf289f',
74+
'gl.inet-gl-xe300',
75+
'wavlink-ws-wn572hp3-4g',
76+
'tp-link-tl-mr6400-v5') then
77+
has_lte = true
78+
end
79+
80+
is_outdoor = false
81+
if device('devolo-wifi-pro-1750x',
82+
'aruba-ap-365',
83+
'wavlink-ws-wn572hp3-4g',
84+
'tp-link-wbs210-v2',
85+
'tp-link-cpe510-v3',
86+
'tp-link-archer-c50-v4',
87+
'tp-link-eap225-outdoor-v1',
88+
'tp-link-archer-c50-v3',
89+
'tp-link-wbs210-v1',
90+
'tp-link-cpe510-v1',
91+
'tp-link-cpe210-v1',
92+
'tp-link-archer-c20-v5',
93+
'tp-link-cpe220-v3',
94+
'tp-link-cpe710-v1',
95+
'tp-link-wbs510-v1',
96+
'tp-link-cpe510-v2',
97+
'tp-link-eap225-outdoor-v3',
98+
'tp-link-cpe210-v3',
99+
'tp-link-cpe210-v2',
100+
'zyxel-nwa55axe',
101+
'mikrotik-sxtsq-5-ac-rbsxtsqg-5acd',
102+
'plasma-cloud-pa1200') then
103+
is_outdoor = true
104+
end
105+
106+
no_wifi24 = false
107+
if device('ubiquiti-edgerouter-x',
108+
'ubiquiti-edgerouter-x-sfp',
109+
'tp-link-cpe510-v3',
110+
'tp-link-cpe510-v1',
111+
'tp-link-cpe710-v1',
112+
'tp-link-wbs510-v1',
113+
'tp-link-cpe510-v2',
114+
'mikrotik-sxtsq-5-ac-rbsxtsqg-5acd') then
115+
no_wifi24 = true
116+
end
117+
118+
no_wifi50 = false
119+
if device('sophos-ap15',
120+
'd-link-dap-1365-a1',
121+
'd-link-dap-1330-a1',
122+
'd-link-dir-505',
123+
'gl.inet-gl-xe300',
124+
'gl.inet-gl-usb150',
125+
'gl.inet-gl-ar150',
126+
'gl.inet-vixmini',
127+
'gl.inet-microuter-n300',
128+
'gl.inet-gl-ar300m-lite',
129+
'alfa-network-ap121f',
130+
'onion-omega',
131+
'netgear-dgn3500b',
132+
'lemaker-banana-pro',
133+
'ubiquiti-edgerouter-x',
134+
'ubiquiti-unifi-ap',
135+
'ubiquiti-edgerouter-x-sfp',
136+
'avm-fritz-box-7360-v2',
137+
'avm-fritz-box-7412',
138+
'avm-fritz-box-7312',
139+
'avm-fritz-wlan-repeater-450e',
140+
'avm-fritz-box-4020',
141+
'xiaomi-mi-router-4c',
142+
'tp-link-wbs210-v2',
143+
'tp-link-tl-wr1043nd-v3',
144+
'tp-link-tl-wr842n-v3',
145+
'tp-link-tl-mr3420-v5',
146+
'tp-link-tl-wa801nd-v5',
147+
'tp-link-tl-wr841n-v13',
148+
'tp-link-wbs210-v1',
149+
'tp-link-tl-wr1043nd-v4',
150+
'tp-link-tl-wr1043nd-v2',
151+
'tp-link-cpe210-v1',
152+
'tp-link-cpe220-v3',
153+
'tp-link-tl-wr1043n-v5',
154+
'tp-link-tl-mr3020-v3',
155+
'tp-link-cpe210-v3',
156+
'tp-link-tl-mr6400-v5',
157+
'tp-link-cpe210-v2',
158+
'plasma-cloud-pa300',
159+
'plasma-cloud-pa300e') then
160+
no_wifi50 = true
161+
end
162+
163+
atmost_64mb_ram = false
164+
if device('ravpower-rp-wd009',
165+
'd-link-dap-1365-a1',
166+
'd-link-dap-1330-a1',
167+
'd-link-dir-505',
168+
'gl.inet-gl-usb150',
169+
'gl.inet-gl-ar150',
170+
'gl.inet-vixmini',
171+
'alfa-network-ap121f',
172+
'onion-omega',
173+
'asus-rt-ac51u',
174+
'netgear-wndr3700-v2',
175+
'netgear-ex6130',
176+
'netgear-r6020',
177+
'netgear-ex3700',
178+
'netgear-ex6150',
179+
'netgear-r6120',
180+
'netgear-dgn3500b',
181+
'ubiquiti-unifi-ap',
182+
'avm-fritz-wlan-repeater-300e',
183+
'avm-fritz-wlan-repeater-1750e',
184+
'avm-fritz-box-7312',
185+
'avm-fritz-wlan-repeater-450e',
186+
'xiaomi-mi-router-4c',
187+
'tp-link-archer-d50-v1',
188+
'tp-link-wbs210-v2',
189+
'tp-link-cpe510-v3',
190+
'tp-link-archer-c50-v4',
191+
'tp-link-re200-v2',
192+
'tp-link-tl-wr1043nd-v3',
193+
'tp-link-tl-wr842n-v3',
194+
'tp-link-tl-wr902ac-v1',
195+
'tp-link-tl-mr3420-v5',
196+
'tp-link-re200-v3',
197+
'tp-link-tl-wa801nd-v5',
198+
'tp-link-tl-wr841n-v13',
199+
'tp-link-archer-c50-v3',
200+
'tp-link-archer-c50-v1',
201+
'tp-link-archer-c60-v1',
202+
'tp-link-archer-c2-v3',
203+
'tp-link-wbs210-v1',
204+
'tp-link-tl-wr1043nd-v4',
205+
'tp-link-cpe510-v1',
206+
'tp-link-re200-v4',
207+
'tp-link-tl-wr1043nd-v2',
208+
'tp-link-cpe210-v1',
209+
'tp-link-archer-c20-v5',
210+
'tp-link-tl-wr902ac-v3',
211+
'tp-link-cpe220-v3',
212+
'tp-link-wbs510-v1',
213+
'tp-link-cpe510-v2',
214+
'tp-link-tl-wr1043n-v5',
215+
'tp-link-td-w8980',
216+
'tp-link-tl-mr3020-v3',
217+
'tp-link-cpe210-v3',
218+
'tp-link-tl-mr6400-v5',
219+
'tp-link-archer-c58-v1',
220+
'tp-link-archer-c25-v1',
221+
'tp-link-cpe210-v2',
222+
'plasma-cloud-pa300',
223+
'plasma-cloud-pa300e') then
224+
atmost_64mb_ram = true
225+
end

‎image-customization.lua

Lines changed: 16 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ features {
1717

1818
packages {
1919
'iwinfo',
20-
'ffac-ssid-changer',
2120
'ffac-wg-registration',
22-
'ff-web-ap-timer',
2321
'respondd-module-airtime',
2422
'tecff-general-workaround',
25-
'tecff-broken-wlan-workaround',
2623
}
2724

28-
if not device_class('tiny') then
25+
include('image-customization-helper.lua')
26+
27+
-- only add if not tiny and at more than 64MB RAM
28+
if not device_class('tiny') and not atmost_64mb_ram then
2929
features {
3030
'tls',
3131
'wireless-encryption-wpa3',
@@ -37,15 +37,17 @@ if not device_class('tiny') then
3737
}
3838
end
3939

40-
if device({
41-
'zte-mf281',
42-
'glinet-gl-xe300',
43-
'glinet-gl-ap1300',
44-
'zte-mf289f',
45-
'zte-mf286r',
46-
'wavlink-ws-wn572hp3-4g',
47-
'tp-link-tl-mr6400-v5',
48-
}) then
40+
41+
-- include packages only if any wifi is available
42+
if not no_wifi24 and not no_wifi50 then
43+
packages {
44+
'ff-web-ap-timer',
45+
'ffac-ssid-changer',
46+
'tecff-broken-wlan-workaround',
47+
}
48+
end
49+
50+
if has_lte then
4951
features {
5052
'web-cellular',
5153
}
@@ -113,68 +115,8 @@ pkgs_pci = {
113115
'kmod-bnx2', -- Broadcom NetExtreme BCM5706/5708/5709/5716
114116
}
115117

116-
include_usb = true
117-
118118
-- rtl838x has no USB support as of Gluon v2023.2
119-
if target('realtek', 'rtl838x') or target('ramips', 'mt7620') then
120-
include_usb = false
121-
end
122-
123-
-- 7M usable firmware space + USB port
124-
if target('ath79', 'generic') and not device({
125-
'devolo-wifi-pro-1750e',
126-
'gl.inet-gl-ar150',
127-
'gl.inet-gl-ar300m-lite',
128-
'gl.inet-gl-ar750',
129-
'joy-it-jt-or750i',
130-
'netgear-wndr3700-v2',
131-
'tp-link-archer-a7-v5',
132-
'tp-link-archer-c5-v1',
133-
'tp-link-archer-c7-v2',
134-
'tp-link-archer-c7-v5',
135-
'tp-link-archer-c59-v1',
136-
'tp-link-tl-wr842n-v3',
137-
'tp-link-tl-wr1043nd-v4',
138-
'tp-link-tl-wr1043n-v5',
139-
}) then
140-
include_usb = false
141-
end
142-
143-
if target('ramips', 'mt76x8') and not device({
144-
'gl-mt300n-v2',
145-
'gl.inet-microuter-n300',
146-
'netgear-r6120',
147-
'ravpower-rp-wd009',
148-
}) then
149-
include_usb = false
150-
end
151-
152-
-- 7M usable firmware space + USB port
153-
if device({
154-
'avm-fritz-box-7412',
155-
'tp-link-td-w8970',
156-
'tp-link-td-w8980',
157-
'gl-mt300n-v2',
158-
'gl.inet-microuter-n300',
159-
'netgear-r6120',
160-
'ravpower-rp-wd009'
161-
}) then
162-
include_usb = false
163-
end
164-
165-
-- devices without usb ports
166-
if device({
167-
'ubiquiti-unifi-6-lr-v1',
168-
'netgear-ex6150',
169-
'netgear-ex3700',
170-
'ubiquiti-edgerouter-x',
171-
'ubiquiti-edgerouter-x-sfp',
172-
'zyxel-nwa55axe',
173-
}) then
174-
include_usb = false
175-
end
176-
177-
if include_usb then
119+
if has_usb and not target('realtek', 'rtl838x') or target('ramips', 'mt7620') then
178120
packages(pkgs_usb)
179121
packages(pkgs_usb_net)
180122
packages(pkgs_usb_serial)

0 commit comments

Comments
 (0)