Announcement: changes to the official Github repository

[RMerlin]

Hi everyone (in particular developers).

Since a majority of devices are now on the 3006.102 branch, I have decided to make that branch the new default branch. 3004.388 will continue as a separate branch for any future development on that branch, and therefore will no longer rely on the old master branch.

The change was necessary because it was not possible to cleanly fold back the 3006.102 branch on top of master - too many diverting changes between the two branches over the course of ~12 months of development.

To make things clearer, I have also renamed the 3006.102 branch to main. 3006.102-wifi6 and 3006.102_37526 (temporary RT-BE92U branch) are now childs of the main branch.

The old master branch remains for historical purposes. I am considering renaming it for master-old in the near future.

Old workflow:

master
|
\--3004.388

3006.102
|
+-- 3006.102-wifi6
\-- 3006.102_37526

New workflow:

3004.388

main
|
+--- 3006.102-wifi6
\--- 3006.102_37526

If you had a local clone of the repo, you need to run the following commandes to update your local repo with these changes. These instructions are also displayed by Github when you access the Code page of the repo.

git branch -m 3006.102 main
git fetch origin
git branch -u origin/main main
git remote set-head origin -a

I will update the build-all script later on to reflect those changes.

 

[dave14305]

Do you expect you’ll be able to consolidate 3006.102 branches with the next GPL? Or will Wifi6 devices always be separate from Wifi7?

 

[RMerlin]

Do you expect you’ll be able to consolidate 3006.102 branches with the next GPL? Or will Wifi6 devices always be separate from Wifi7?

I don't have any detailed facts, but from what I gathered in my exchanges with them is that at least for the time being, Wifi 6 would remain on a separate branch. That's why the version numbers don't really match, the Wifi 6 code is newer than the Wifi 7 despite having a lower version.