Skip to content

Commit 813278c

Browse files
committed
add libremesh feeds
1 parent 90e73ea commit 813278c

10 files changed

Lines changed: 1399 additions & 21 deletions

File tree

.github/workflows/static-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ 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
4545
4646
- name: Upload artifact
4747
uses: actions/upload-pages-artifact@v3

.github/workflows/static-stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
sed -i "s;%GIT_VERSION%;$(git describe --tags);" index.js
3838
sed -i 's;image_url: "../misc",;image_url: "https://downloads.openwrt.org",;' config.js
3939
sed -i "s; //show_snapshots; show_snapshots;" config.js
40-
sed -i "s; versions; // versions;" config.js
40+
# sed -i "s; versions; // versions;" config.js
4141
4242
- name: Upload using rsync
4343
run: |

pnpm-lock.yaml

Lines changed: 941 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/test_spa.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ def test_spa(simplehttpserver):
55
browser = p.firefox.launch()
66
page = browser.new_page()
77
page.goto("http://localhost:8000/www/")
8-
assert "OpenWrt Firmware Selector" in page.title()
8+
assert "LibreMesh 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("24.10.5")[0] == "24.10.5"
1111

1212
page.fill("#models", "a7 v5")
1313
models = page.inner_text("#models-autocomplete-list")

www/config.js

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,38 @@ 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: ["SNAPSHOT", "25.12-SNAPSHOT", "25.12.0", "24.10-SNAPSHOT", "24.10.5", "23.05-SNAPSHOT", "23.05.6"],
99

1010
// Pre-selected version (optional if provided by .versions.json)
11-
default_version: "23.05.4",
11+
// default_version: "24.10.5",
1212

1313
// Image download URL (e.g. "https://downloads.openwrt.org")
14-
image_url: "../misc",
14+
image_url: "https://downloads.openwrt.org",
15+
feed_url: "https://downloads.openwrt.org",
1516

1617
// Insert snapshot versions (optional)
17-
//show_snapshots: true,
18+
show_snapshots: true,
19+
upcoming_version: false,
1820

1921
// Info link URL (optional)
2022
info_url: "https://openwrt.org/start?do=search&id=toh&q={title} @toh",
2123

2224
// Attended Sysupgrade Server support (optional)
23-
asu_url: "https://sysupgrade.openwrt.org",
24-
asu_extra_packages: ["luci"],
25+
asu_url: "https://sysupgrade.antennine.org",
26+
asu_fallback_url: "https://sysupgrade-01.antennine.org",
27+
asu_extra_packages: [""],
28+
29+
lime: {
30+
feed_url: "https://feed.libremesh.org",
31+
pubkey_apk: "-----BEGIN PUBLIC KEY-----\n\
32+
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdFJZ2qVti49Ol8LJZYuxgOCLowBS\n\
33+
8bI86a7zqhSbs5yon3JON7Yee7CQOgqwPOX5eMALGOu8iFGAqIRx5YjfYA==\n\
34+
-----END PUBLIC KEY-----",
35+
pubkey_opkg: "RWSnGzyChavSiyQ+vLk3x7F0NqcLa4kKyXCdriThMhO78ldHgxGljM/8",
36+
branches: [
37+
// "main",
38+
"master",
39+
"dev",
40+
],
41+
},
2542
};

www/index.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ header > div {
353353
overflow: scroll;
354354
}
355355

356+
#lime-packages,
356357
#asu-packages,
357358
#uci-defaults-content,
358359
#uci-defaults-group {
@@ -368,6 +369,7 @@ header > div {
368369
/* light mode */
369370
header {
370371
background-color: #00a3e1;
372+
background-color: #fff;
371373
}
372374

373375
body {
@@ -409,6 +411,7 @@ body {
409411
@media (prefers-color-scheme: dark) {
410412
header {
411413
background-color: #0080b3;
414+
background-color: #252528;
412415
}
413416

414417
body {
@@ -469,3 +472,16 @@ body {
469472
background-color: red;
470473
text-align: center;
471474
}
475+
476+
#flavor-select,
477+
#ref-select {
478+
width: 100%;
479+
padding: 1em;
480+
font-size: 1em;
481+
margin-bottom: 0.5em;
482+
}
483+
484+
#flavor-select > *,
485+
#ref-select > * {
486+
padding: 1em;
487+
}

www/index.html

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<head>
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<title>OpenWrt Firmware Selector</title>
8-
<link rel="icon" href="favicon.ico" />
7+
<title>LibreMesh Firmware Selector</title>
8+
<link rel="icon" href="https://libremesh.org/favicon.ico" />
99
<link rel="stylesheet" href="index.css" />
1010
<script src="config.js"></script>
1111
<script src="index.js"></script>
@@ -14,8 +14,8 @@
1414
<!-- header across the whole page -->
1515
<header>
1616
<div>
17-
<a href="https://openwrt.org">
18-
<img src="logo.svg" width="180" alt="Logo" />
17+
<a href="https://libremesh.org">
18+
<img src="/libremesh_logo.svg" width="180" alt="Logo" />
1919
</a>
2020
<div style="flex-grow: 1"></div>
2121
<div>
@@ -79,11 +79,17 @@
7979

8080
<div class="container">
8181
<div>
82-
<h2 class="tr-load">Download OpenWrt Firmware for your Device</h2>
82+
<h2 class="tr-libremesh-load">
83+
Build LibreMesh firmware for your Device
84+
</h2>
8385
<p class="tr-message">
8486
Type the name or model of your device, then select a stable build or
8587
the nightly "snapshot" build.
8688
</p>
89+
<p>
90+
Download old precompiled versions from
91+
<a href="https://firmware-libremesh.antennine.org/releases/">here</a>.
92+
</p>
8793

8894
<!-- Model name and Build dropdown -->
8995
<div id="models-autocomplete" class="autocomplete">
@@ -158,7 +164,7 @@ <h3 id="build-title" class="tr-version-build">About this build</h3>
158164
</div>
159165
</div>
160166
<div>
161-
<h4 class="tr-packages">Installed Packages</h4>
167+
<h4 class="tr-openwrt-packages">OpenWrt Packages</h4>
162168
<textarea
163169
rows="10"
164170
id="asu-packages"
@@ -167,6 +173,39 @@ <h4 class="tr-packages">Installed Packages</h4>
167173
autocapitalize="off"
168174
></textarea>
169175
</div>
176+
<div>
177+
<h4 class="tr-libremesh-packages">LibreMesh Packages</h4>
178+
<div>
179+
<div style="display: flex">
180+
<span style="padding: 1em; min-width: 15em"
181+
>Flavor:
182+
</span>
183+
<select id="flavor-select">
184+
<option value="default">
185+
default (babeld, batman-adv, anygw, lime-app,
186+
shared-state-async)
187+
</option>
188+
<option value="mini">
189+
mini (babeld, batman-adv, anygw, shared-state)
190+
</option>
191+
<option value="babeld-only">babeld-only</option>
192+
</select>
193+
</div>
194+
<div style="display: flex">
195+
<span style="padding: 1em; min-width: 15em"
196+
>Feed Branch:
197+
</span>
198+
<select id="ref-select"></select>
199+
</div>
200+
</div>
201+
<textarea
202+
rows="10"
203+
id="lime-packages"
204+
autocomplete="off"
205+
spellcheck="false"
206+
autocapitalize="off"
207+
></textarea>
208+
</div>
170209
<h4 class="tr-defaults">
171210
Script to run on first boot (uci-defaults)
172211
</h4>
@@ -206,12 +245,12 @@ <h3 class="tr-downloads">Download an image</h3>
206245
</div>
207246

208247
<div id="footer">
209-
<span
248+
<!-- <span
210249
><a href="https://downloads.openwrt.org" class="tr-server-link"
211250
>All Downloads</a
212251
></span
213252
>
214-
|
253+
| -->
215254
<span
216255
><a
217256
href="https://forum.openwrt.org/t/the-openwrt-firmware-selector/81721"

0 commit comments

Comments
 (0)