Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gnuton/asuswrt-merlin.ng
Browse files Browse the repository at this point in the history
  • Loading branch information
@gnuton
gnuton committed Jul 5, 2024
2 parents 85457af + c21ff5b commit 3981ba7
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 35 deletions.
59 changes: 31 additions & 28 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,34 +39,14 @@ My builds are intended to support all features present in the original Merlin fi

If you enjoy this project feel free to scroll all the way down and check on how you can ❤️ this project!

---------------------

### [Stats](https://somsubhra.github.io/github-release-stats/?username=gnuton&repository=asuswrt-merlin.ng)
Latest release:
[
![GitHub release](https://img.shields.io/github/release/gnuton/asuswrt-merlin.ng.svg)
![GitHub Release Date](https://img.shields.io/github/release-date/gnuton/asuswrt-merlin.ng.svg)
![GitHub Releases](https://img.shields.io/github/downloads/gnuton/asuswrt-merlin.ng/latest/total.svg)
](https://github.com/gnuton/asuswrt-merlin.ng/releases/latest)

Latest pre-release:
[
![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/release/gnuton/asuswrt-merlin.ng?include_prereleases&label=pre-release)
![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/gnuton/asuswrt-merlin.ng)
![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/downloads-pre/gnuton/asuswrt-merlin.ng/latest/total)
](https://github.com/gnuton/asuswrt-merlin.ng/releases/)

All releases:
![GitHub All Releases](https://img.shields.io/github/downloads/gnuton/asuswrt-merlin.ng/total.svg)

Latest Merlin firmware version: ![GitHub release](https://img.shields.io/github/tag/RMerl/asuswrt-merlin.ng.svg)


---------------------

### Supported Models

388.x firmware: ⬇️ Download latest [release](https://github.com/gnuton/asuswrt-merlin.ng/releases/latest) or [testing pre-release](https://github.com/gnuton/asuswrt-merlin.ng/releases/) ⬇️
### ⬇️ Firmware downloads
3006.102.x firmware downloads: latest [testing](https://github.com/gnuton/asuswrt-merlin.ng/releases/tag/3006.102.1_1-gnuton0_beta1)
* [GT-BE98](https://rog.asus.com/networking/rog-rapture-gt-be98-model)

3004.388.x firmware downloads: [stable](https://github.com/gnuton/asuswrt-merlin.ng/releases/latest) or [testing](https://github.com/gnuton/asuswrt-merlin.ng/releases/tag/3004.388.8_0-gnuton0_alpha1)
* [DSL-AX82U/DSL-AX5400](https://www.asus.com/Networking-IoT-Servers/WiFi-6/All-series/DSL-AX82U/)
* [RT-AX82U v1](https://www.asus.com/Networking-IoT-Servers/WiFi-6/All-series/RT-AX82U/)
* [RT-AX82U v2](https://www.asus.com/Networking-IoT-Servers/WiFi-6/All-series/RT-AX82U/)
Expand All @@ -78,8 +58,8 @@ Latest Merlin firmware version: ![GitHub release](https://img.shields.io/github/
* [ZenWiFi XT8 / RT-AX95Q v1](https://www.asus.com/Networking-IoT-Servers/Whole-Home-Mesh-WiFi-System/ZenWiFi-WiFi-Systems/ASUS-ZenWiFi-AX-XT8/)
* [ZenWifi ET8 / RT-AXE95Q](https://www.asus.com/networking-iot-servers/whole-home-mesh-wifi-system/zenwifi-wifi-systems/asus-zenwifi-et8/)

386.x firmware:
* [DSL-AC68U](https://www.asus.com/Networking-IoT-Servers/Modem-Routers/All-series/DSLAC68U/) ⬇️ Download latest stable [386.12_0-gnuton1](https://github.com/gnuton/asuswrt-merlin.ng/releases/tag/386.12_0-gnuton1) ⬇️
386.x firmware downloads: [stable](https://github.com/gnuton/asuswrt-merlin.ng/releases/tag/386.12_0-gnuton1) or [testing](https://github.com/gnuton/asuswrt-merlin.ng/releases/tag/386.14_0-gnuton0_beta1)
* [DSL-AC68U](https://www.asus.com/Networking-IoT-Servers/Modem-Routers/All-series/DSLAC68U/)

If you cannot find your router in the above list, please read [🔥 here 🔥](https://github.com/gnuton/asuswrt-merlin.ng/issues/523)!

Expand All @@ -90,8 +70,31 @@ Not sure which version you have? V1? V2? Enable SSH, then ssh into your router a
### Experimental builds:
* DSL-AC68U & DSL-AX82U
* [Repeater Mode](https://github.com/gnuton/asuswrt-merlin.ng/releases/tag/gnuton-snapshot-feature-repeater) Unleash Repeater along with all other [operational modes](https://www.asus.com/support/FAQ/1015007/). Please note that AiMesh is supported by standard images and it's much performant than repeater but it works only with other Asus routers.


---------------------

### [Stats](https://somsubhra.github.io/github-release-stats/?username=gnuton&repository=asuswrt-merlin.ng)
Latest release:
[
![GitHub release](https://img.shields.io/github/release/gnuton/asuswrt-merlin.ng.svg)
![GitHub Release Date](https://img.shields.io/github/release-date/gnuton/asuswrt-merlin.ng.svg)
![GitHub Releases](https://img.shields.io/github/downloads/gnuton/asuswrt-merlin.ng/latest/total.svg)
](https://github.com/gnuton/asuswrt-merlin.ng/releases/latest)

Latest pre-release:
[
![GitHub tag (latest SemVer pre-release)](https://img.shields.io/github/v/release/gnuton/asuswrt-merlin.ng?include_prereleases&label=pre-release)
![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/gnuton/asuswrt-merlin.ng)
![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/downloads-pre/gnuton/asuswrt-merlin.ng/latest/total)
](https://github.com/gnuton/asuswrt-merlin.ng/releases/)

All releases:
![GitHub All Releases](https://img.shields.io/github/downloads/gnuton/asuswrt-merlin.ng/total.svg)

Latest Merlin firmware version: ![GitHub release](https://img.shields.io/github/tag/RMerl/asuswrt-merlin.ng.svg)

---------------------

### Thanks to
- Asus for the GPLs and HW samples.
- Upstream Asus Merlin [devs](https://github.com/RMerl/asuswrt-merlin.ng/graphs/contributors)
Expand Down
16 changes: 9 additions & 7 deletions release/src/router/rom/webs_scripts/merlin_webs_update.sh
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh
set -u;

wget_options="-q -t 2 -T 30"

fwsite="https://raw.githubusercontent.com/gnuton/asuswrt-merlin.ng/master/updates/"
fwsite="https://raw.githubusercontent.com/gnuton/asuswrt-merlin.ng/master/updates"

nvram set webs_state_update=0 # INITIALIZING
nvram set webs_state_flag=0 # 0: Don't do upgrade 1: Do upgrade
Expand All @@ -18,14 +18,15 @@ fi
current_base=$(nvram get firmver | sed "s/\.//g")
current_firm=$(nvram get buildno | cut -d. -f1)
current_buildno=$(nvram get buildno | cut -d. -f2)
current_extendno=$(nvram get extendno | sed "s/-g.*//" | sed "s/_.*//" | sed "s/alpha\|beta/-1/")
#Extract extendno, subtract value by 1 if it contains "alpha/beta", remove all other values such as "_rog" or "-g*"
current_extendno="$(nvram get extendno | awk -F'[_-]' '{n=$1} /[aA]lpha|[bB]eta/{n--} END{print n}')"

# get firmware information
model=$(nvram get productid)
model="$model#"

echo "---- update real normal----" > /tmp/webs_upgrade.log
/usr/sbin/wget $wget_options $fwsite/manifest2.txt -O /tmp/wlan_update.txt
echo "---- update real normal----" > /tmp/webs_upgrade.log
/usr/sbin/wget $wget_options $fwsite/manifest2.txt -O /tmp/wlan_update.txt

if [ "$?" != "0" ]; then
nvram set webs_state_error=1
Expand Down Expand Up @@ -85,12 +86,13 @@ if [ "$webs_state_flag" -eq "1" ]; then
releasenote_file0=$(nvram get webs_state_info)_note.txt
releasenote_path0="/tmp/release_note0.txt"
echo "---- download real release note ----" >> /tmp/webs_upgrade.log
/usr/sbin/wget $wget_options $fwsite/$releasenote_file0 -O $releasenote_path0
/usr/sbin/wget $wget_options $fwsite/$releasenote_file0_US -O $releasenote_path0
echo "---- $fwsite/$releasenote_file0_US ----" >> /tmp/webs_upgrade.log
if [ "$?" != "0" ]; then
echo "---- download $fwsite/$releasenote_file0 failed ----" >> /tmp/webs_upgrade.log
nvram set webs_state_error=1
else
else
echo "---- $fwsite/$releasenote_file0 ----" >> /tmp/webs_upgrade.log
fi
fi
Expand Down
12 changes: 12 additions & 0 deletions updates/3004_388.7_1-gnuton1_note.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## GNUton's Asus Merlin changelog ##

Date: June 10, 2024
Release: 3004.388.7_1-gnuton1

- ADDED: XT kernel module for SDK 5.04 models
Allows Skynet and other addons to work
- FIXED: RT-AX58U_V2: Fixed errors when changing 2.4 Ghz setting
- FIXED: TUF theme
- FIXED: RT-AX82U V2 firmware upgrade not working


14 changes: 14 additions & 0 deletions updates/manifest2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RT-AX82U_V2#FW3004.388.6#EXT0-gnuton1
RT-AX5400#FW3004.388.6#EXT0-gnuton1
TUF-AX5400#FW3004.388.6#EXT0-gnuton1
TUF-AX3000#FW3004.388.6#EXT0-gnuton1
RT-AX92U#FW3004.388.6#EXT0-gnuton1
RT-AX95Q#FW3004.388.6#EXT0-gnuton1
RT-AXE95Q#FW3004.388.6#EXT0-gnuton1
DSL-AX82U#FW3004.388.6#EXT2-gnuton1
Expand All @@ -13,7 +14,20 @@ RT-AX5400#FW3004.388.6#EXT2-gnuton1
TUF-AX5400#FW3004.388.6#EXT2-gnuton1
TUF-AX3000#FW3004.388.6#EXT2-gnuton1
TUF-AX3000_V2#FW3004.388.6#EXT2-gnuton1
RT-AX92U#FW3004.388.6#EXT2-gnuton1
RT-AX95Q#FW3004.388.6#EXT2-gnuton1
RT-AXE95Q#FW3004.388.6#EXT2-gnuton1
RT-AX5400#FW3004.388.6#EXT2-gnuton1
RT-AX58U_V2#FW3004.388.6#EXT2-gnuton1
DSL-AX82U#FW3004.388.7#EXT1-gnuton1
RT-AX82U#FW3004.388.7#EXT1-gnuton1
RT-AX82U_V2#FW3004.388.7#EXT1-gnuton1
RT-AX5400#FW3004.388.7#EXT1-gnuton1
TUF-AX5400#FW3004.388.7#EXT1-gnuton1
TUF-AX3000#FW3004.388.7#EXT1-gnuton1
TUF-AX3000_V2#FW3004.388.7#EXT1-gnuton1
RT-AX92U#FW3004.388.7#EXT1-gnuton1
RT-AX95Q#FW3004.388.7#EXT1-gnuton1
RT-AXE95Q#FW3004.388.7#EXT1-gnuton1
RT-AX5400#FW3004.388.7#EXT1-gnuton1
RT-AX58U_V2#FW3004.388.7#EXT1-gnuton1

0 comments on commit 3981ba7

Please sign in to comment.