Skip to content

Commit 4859b01

Browse files
a-gavea-gave
committed
libremesh: add changes
1 parent 0b083d5 commit 4859b01

9 files changed

Lines changed: 716 additions & 43 deletions

File tree

‎.github/workflows/static-main.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ jobs:
4141
sed -i "s;%GIT_VERSION%;$(git describe --tags);" index.js
4242
sed -i 's;image_url: "../misc",;image_url: "https://downloads.openwrt.org",;' config.js
4343
sed -i "s; //show_snapshots; show_snapshots;" config.js
44-
sed -i "s; versions; // versions;" config.js
44+
# sed -i "s; versions; // versions;" config.js
45+
sed -i 's;OpenWrt;LibreMesh;g' langs/* index.html
46+
sed -i 's;downloads.openwrt.org;downloads.libremesh.org;g' index.html
47+
sed -i 's;https://openwrt.org;https://libremesh.org;' index.html
4548
4649
- name: Upload artifact
4750
uses: actions/upload-pages-artifact@v3

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
build/
22
node_modules/
33
__pycache__/
4+
*~

‎tests/test_spa.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ def test_spa(simplehttpserver):
77
page.goto("http://localhost:8000/www/")
88
assert "OpenWrt Firmware Selector" in page.title()
99

10-
assert page.locator("#versions").select_option("19.07.10")[0] == "19.07.10"
10+
assert page.locator("#versions").select_option("master-ow24.10.5")[0] == "master-ow24.10.5"
1111

12+
# wait 1s to ensure that the remote .overview.json have been fetched
13+
page.wait_for_timeout(1000)
1214
page.fill("#models", "a7 v5")
1315
models = page.inner_text("#models-autocomplete-list")
1416
assert "TP-Link Archer A7 v5" in models

‎www/config.js‎

Lines changed: 106 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,80 @@ var config = {
55
show_help: true,
66

77
// Versions list (optional if provided by .versions.json)
8-
versions: ["23.05.4", "19.07.10"],
8+
versions: [
9+
"master-owSNAPSHOT",
10+
"master-ow25.12-SNAPSHOT",
11+
"master-ow24.10-SNAPSHOT",
12+
"master-ow24.10.5",
13+
"master-ow24.10.4",
14+
"master-ow23.05-SNAPSHOT",
15+
"master-ow23.05.6",
16+
"2024.1-ow23.05.5-default",
17+
"2024.1-ow23.05.5-mini",
18+
"2020.4-ow19",
19+
],
20+
versions_info: {
21+
"master-owSNAPSHOT": {
22+
build_only: true,
23+
openwrt_version: "SNAPSHOT",
24+
libremesh_ref: "master",
25+
flavor: "default",
26+
},
27+
"master-ow25.12-SNAPSHOT": {
28+
build_only: true,
29+
openwrt_version: "25.12-SNAPSHOT",
30+
libremesh_ref: "master",
31+
flavor: "default",
32+
},
33+
"master-ow24.10-SNAPSHOT": {
34+
build_only: true,
35+
openwrt_version: "24.10-SNAPSHOT",
36+
libremesh_ref: "master",
37+
flavor: "default",
38+
},
39+
"master-ow24.10.5": {
40+
build_only: true,
41+
openwrt_version: "24.10.5",
42+
libremesh_ref: "master",
43+
flavor: "default",
44+
},
45+
"master-ow24.10.4": {
46+
build_only: true,
47+
openwrt_version: "24.10.4",
48+
libremesh_ref: "master",
49+
flavor: "default",
50+
},
51+
"master-ow23.05-SNAPSHOT": {
52+
build_only: true,
53+
openwrt_version: "23.05-SNAPSHOT",
54+
libremesh_ref: "master",
55+
flavor: "default",
56+
},
57+
"master-ow23.05.6": {
58+
build_only: true,
59+
openwrt_version: "23.05.6",
60+
libremesh_ref: "master",
61+
flavor: "default",
62+
},
63+
"2024.1-ow23.05.5-default": {
64+
openwrt_version: "23.05.5",
65+
libremesh_ref: "2024.1",
66+
flavor: "default",
67+
},
68+
"2024.1-ow23.05.5-mini": {
69+
openwrt_version: "23.05.5",
70+
libremesh_ref: "2024.1",
71+
flavor: "mini",
72+
},
73+
"2020.4-ow19": { allow_build: false, openwrt_version: "19.07.10" },
74+
},
975

1076
// Pre-selected version (optional if provided by .versions.json)
11-
default_version: "23.05.4",
77+
default_version: "2024.1-ow23.05.5-default",
1278

1379
// Image download URL (e.g. "https://downloads.openwrt.org")
14-
image_url: "../misc",
80+
image_url: "https://firmware-libremesh.antennine.org",
81+
openwrt_image_url: "https://downloads.openwrt.org",
1582

1683
// Insert snapshot versions (optional)
1784
//show_snapshots: true,
@@ -20,6 +87,40 @@ var config = {
2087
info_url: "https://openwrt.org/start?do=search&id=toh&q={title} @toh",
2188

2289
// Attended Sysupgrade Server support (optional)
23-
asu_url: "https://sysupgrade.openwrt.org",
24-
asu_extra_packages: ["luci"],
90+
asu_url: "https://sysupgrade.antennine.org",
91+
// asu_extra_packages: ["owut"],
92+
93+
flavors: {
94+
default: [
95+
"babeld-auto-gw-mode",
96+
"batctl-default",
97+
"check-date-http",
98+
"lime-app",
99+
"lime-debug",
100+
"lime-docs",
101+
"lime-docs-minimal",
102+
"lime-hwd-ground-routing",
103+
"lime-hwd-openwrt-wan",
104+
"lime-proto-anygw",
105+
"lime-proto-babeld",
106+
"lime-proto-batadv",
107+
"shared-state",
108+
"shared-state-babeld_hosts",
109+
"shared-state-bat_hosts",
110+
"shared-state-nodes_and_links",
111+
],
112+
mini: [
113+
"babeld-auto-gw-mode",
114+
"lime-docs-minimal",
115+
"lime-hwd-openwrt-wan",
116+
"lime-proto-anygw",
117+
"lime-proto-babeld",
118+
"lime-proto-batadv",
119+
"shared-state",
120+
"shared-state-babeld_hosts",
121+
],
122+
},
123+
124+
// packages changes from openwrt's default_packages
125+
version_packages: ["-dnsmasq", "-odhcpd-ipv6only", "-ppp", "-ppp-mod-pppoe"],
25126
};

‎www/favicon.ico‎

-1.28 KB
Binary file not shown.

‎www/index.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ html {
2525
display: none !important;
2626
}
2727

28-
#downloads2 {
28+
#downloads2:not(.hide) {
2929
display: block !important;
3030
}
3131
}
@@ -367,7 +367,7 @@ header > div {
367367

368368
/* light mode */
369369
header {
370-
background-color: #00a3e1;
370+
background-color: transparent;
371371
}
372372

373373
body {
@@ -408,7 +408,7 @@ body {
408408
/* dark mode */
409409
@media (prefers-color-scheme: dark) {
410410
header {
411-
background-color: #0080b3;
411+
background-color: #fff;
412412
}
413413

414414
body {

‎www/index.html‎

Lines changed: 101 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,31 @@
99
<link rel="stylesheet" href="index.css" />
1010
<script src="config.js"></script>
1111
<script src="index.js"></script>
12+
<style>
13+
.info-item {
14+
background-color: #fff;
15+
border-radius: 0.3em;
16+
padding: 0.5em;
17+
}
18+
.libremesh-info {
19+
margin: 1em 0;
20+
font-size: 0.9em;
21+
background-color: #ccfea7;
22+
padding: 1em;
23+
border-radius: 0.3em;
24+
line-height: normal;
25+
}
26+
27+
@media (prefers-color-scheme: dark) {
28+
.info-item {
29+
background-color: #18181b;
30+
color: #fff;
31+
}
32+
.libremesh-info {
33+
background-color: #004d00;
34+
}
35+
}
36+
</style>
1237
</head>
1338
<body onload="init()">
1439
<!-- header across the whole page -->
@@ -157,10 +182,85 @@ <h3 id="build-title" class="tr-version-build">About this build</h3>
157182
</details>
158183
</div>
159184
</div>
185+
186+
<!-- libremesh info -->
187+
<details class="libremesh-info">
188+
<summary>Libremesh packages info</summary>
189+
<div style="margin-top: 1em">
190+
<a
191+
style="display: block; margin: 1em 0"
192+
href="https://libremesh.org/development.html"
193+
>https://libremesh.org/development.html</a
194+
>
195+
<div style="font-size: 0.85em">
196+
<div class="libremesh-version-packages-wrapper">
197+
<strong>Version packages:</strong
198+
><span> related to openwrt default_packages</span>
199+
<p
200+
class="info-item"
201+
id="libremesh-version-packages"
202+
></p>
203+
</div>
204+
<div class="libremesh-device-packages-wrapper">
205+
<strong>Device packages: </strong>
206+
<ul>
207+
<li>
208+
<b>ath10k</b>: replace ath10k-ct with ath10k to work
209+
with 802.11s on most devices
210+
<a
211+
href="https://openwrt.org/docs/guide-user/network/wifi/mesh/80211s"
212+
>Source</a
213+
>
214+
</li>
215+
<li>
216+
<b>ath9k</b>: add the package
217+
<i><b>wifi-unstuck-wa</b></i> to workaround deaf
218+
radios
219+
<a
220+
href="https://github.com/openwrt/openwrt/issues/7016"
221+
>Source</a
222+
>
223+
</li>
224+
</ul>
225+
<p class="info-item" id="libremesh-device-packages"></p>
226+
</div>
227+
<div class="libremesh-default-packages-wrapper">
228+
<strong>Suggested packages:</strong>
229+
<ul>
230+
<li>
231+
<b>default</b>: or use the network profile
232+
<i><b>profile-libremesh-suggested-packages</b></i>
233+
<a
234+
href="https://github.com/libremesh/network-profiles/blob/master/libremesh/suggested-packages/Makefile"
235+
>Source</a
236+
>
237+
</li>
238+
<li>
239+
<b>mini</b>: or use the network profile
240+
<i
241+
><b
242+
>profile-libremesh-suggested-packages-tiny</b
243+
></i
244+
>
245+
<a
246+
href="https://github.com/libremesh/network-profiles/blob/master/libremesh/suggested-packages-tiny/Makefile"
247+
>Source</a
248+
>
249+
</li>
250+
</ul>
251+
<p
252+
class="info-item"
253+
id="libremesh-default-packages"
254+
></p>
255+
</div>
256+
</div>
257+
</div>
258+
</details>
259+
160260
<div>
161261
<h4 class="tr-packages">Installed Packages</h4>
162262
<textarea
163-
rows="10"
263+
rows="20"
164264
id="asu-packages"
165265
autocomplete="off"
166266
spellcheck="false"

0 commit comments

Comments
 (0)