Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vH39 #103

Open
lemoer opened this issue Jan 18, 2025 · 15 comments
Open

vH39 #103

lemoer opened this issue Jan 18, 2025 · 15 comments

Comments

@lemoer
Copy link
Contributor

lemoer commented Jan 18, 2025

Heyho,

let's setup a new (more current) wireguard build. This issue is to track process.

@lemoer
Copy link
Contributor Author

lemoer commented Jan 18, 2025

I would propose, we use gluon release v2023.2.4 as base.

@lemoer
Copy link
Contributor Author

lemoer commented Jan 18, 2025

Getting a first build running

I am currently unsure which site branch to use. There's master-wireguard and stable-wireguard.

The comparison of the two branches looks like this:

* fc04cd7 (origin/master-wireguard) patches: refresh patch for WR841 8M and 16M variants
* 55c17b3 Delete 0002-patches-uradvd-change-ip-lifetimes-to-150-300-seconds.patch
* 1fa3283 Adapted to changes in package definition
* 9a0f62d patches: drop EAP225-Outdoor-v3 patch
* dfbcdd7 patches: refresh patches, drop EAP225-Outdoor-v3 OpenWrt patch
* 9401585 nightly_wireguard-only/site.conf: use jenkins ...
| * 0669244 (tag: vH37, origin/stable-wireguard) patches: refresh upon Gluon v2022.1.4
|/  
* 150f503 site.conf: load packages from firmware.ffh.zone

Due to the most recent commit on master-wireguard (fc04cd7), the mod 841 patch does not apply. If I revert fc04cd7, all patches apply to v2023.2.4. Most likely, this commit has refreshed the patches "too far" to the gluon main or so.

v2023.2 introduced image-customization.lua. @Dark4MD copied an image-customization.lua from ffm in 1fa3283. Since this change is not in stable-wireguard so far, we can not build anything with v2023.2.* from it.

To get a first test build running, I decided to:

  • use v2023.2.4 as base
  • use master-wirguard for site
  • revert fc04cd7 on master-wirguard branch locally
  • start a build of ath79-generic on my laptop.

@lemoer
Copy link
Contributor Author

lemoer commented Jan 18, 2025

Updating the stable-wireguard branch

According to the README.md, we want to make releases from the stable-wireguard branch. Currently, this branch is one commit ahead and 5 commits behind master-wireguard (if we leave off the fc04cd7, which doesn't make sense for v2023.2.4):

* fc04cd7 (origin/master-wireguard) patches: refresh patch for WR841 8M and 16M variants
* 55c17b3 Delete 0002-patches-uradvd-change-ip-lifetimes-to-150-300-seconds.patch
* 1fa3283 Adapted to changes in package definition
* 9a0f62d patches: drop EAP225-Outdoor-v3 patch
* dfbcdd7 patches: refresh patches, drop EAP225-Outdoor-v3 OpenWrt patch
* 9401585 nightly_wireguard-only/site.conf: use jenkins ...
| * 0669244 (tag: vH37, origin/stable-wireguard) patches: refresh upon Gluon v2022.1.4
|/  
* 150f503 site.conf: load packages from firmware.ffh.zone

Since the branches have diverged, I am currently unsure, what's the best way to update stable-wireguard?

  1. merge commit from 55c17b3 into stable-wireguard?
  2. rebase master-wireguard on stable-wireguard so stable-wireguard can be fast-forwarded to 55c17b3?

@AiyionPrime Apart from that, I really like the idea of 0669244. To me, this seems to make perfectly sense to track the gluon version the patches should apply to. This should also land in master-wireguard somehow.

@AiyionPrime
Copy link
Member

this would be vH39, right?
vH38 would be the next fastd firmware.

@1977er 1977er changed the title vH38 vH39 Jan 18, 2025
@lemoer
Copy link
Contributor Author

lemoer commented Jan 18, 2025 via email

@1977er
Copy link
Member

1977er commented Jan 18, 2025

They always come in pairs.

Wir sollten weiterhin immmer zwei parallele Firmwares produzieren, um genau dieses Divergenzproblem zu umgehen.

@lemoer
Copy link
Contributor Author

lemoer commented Jan 18, 2025

I asked around in the gluon irc if there is a reason to build from v2023.2.x instead of v2023.2.4.

The answer was:

There is freifunk-gluon/gluon@6f289cf. It fixes a respondd crash on some architectures (at least ARM64).

@lemoer
Copy link
Contributor Author

lemoer commented Jan 18, 2025

What is done:

  • I looked through the image-customizations.lua from @Dark4MD and adjusted it to be a bit more hannover specific. E.g. in contrast to ffmuc, we only want usb packages in x86.
  • Aiyion updated the uradvd patches, so we don't have to drop them anymore.
  • The drop EAP patch is also on stable-wireguard now (since the device is upstream).
  • The mod 841 patch is now rebased to work on v2023.2.x.
  • We decided to build v2023.2.4 and add freifunk-gluon/gluon@6f289cf as a patch. Aiyion is currently doing this.

After this, we should be finished with rebasing and start a real build from the stable-wireguard branch.

@AiyionPrime
Copy link
Member

The libgen patch has been added in 26dac4a

@lemoer
Copy link
Contributor Author

lemoer commented Jan 20, 2025

TODO-Liste

  • Migration von fastd-keys nach Wireguard prüfen. (done 26-01-2025 by @1977er )

@lemoer
Copy link
Contributor Author

lemoer commented Jan 21, 2025

✅ Problem solved

Currently, the ipq target does not seem to have a migration path:

(from vH34:)

root@...:/tmp# sysupgrade gluon-ffh-vH39.pre-avm-fritz-box-4040-sysupgrade.bin
Tue Jan 21 23:31:33 CET 2025 upgrade: The device is supported, but the config is incompatible to the new image (1.0->1.1). Please upgrade without keeping config (sysupgrade -n).
Tue Jan 21 23:31:33 CET 2025 upgrade: Config cannot be migrated from swconfig to DSA
Image check failed.

This issue is most likely related: freifunk-gluon/gluon#2666

UPDATE: This is not really an issue if autoupdater is used. The autoupdater calls sysupgrade with --ignore-minor-compat-version. Then it's not a problem. The problem only arouse because someone tried to update manually using sysupgrade.

@AiyionPrime
Copy link
Member

AiyionPrime commented Jan 22, 2025

We could drop the check and evaluate whats missing.
Gluon rebuilds large parts of the network config,
would be interesting to see which are amiss and how hard the info is to gather.

Knowing blocktrron though: For him this is a theoretically trivial matter.
I assume there's something more problematic going on, like ipq40xx DSA not working properly yet.
I'd suspect such a thing to be the reason, why he hasn't tackled this migration step, yet.

@1977er
Copy link
Member

1977er commented Jan 25, 2025

✅ Problem solved

Netgear EX6150v2:
opkg update failed due to wrong url:
/etc/opkg/gluon.conf has to point to http://firmware.ffh.zone/vH39.pre/packages/gluon-ffh-vH39.pre/ipq40xx/generic instead of http://firmware.ffh.zone/packages/gluon-ffh-vH39.pre/ipq40xx/generic.

UPDATE by @lemoer: http://firmware.ffh.zone/packages/gluon-ffh-vH39.pre/ipq40xx/generic is now valid.

@AiyionPrime
Copy link
Member

AiyionPrime commented Jan 26, 2025

✅ Problem solved

  • primary mac auf joy-it router prüfen.

UPDATE by @lemoer: The primary macs have changed once, since they were red out buggy. Now, today they are correct (already in older versions than vH39).

@lemoer
Copy link
Contributor Author

lemoer commented Feb 1, 2025

✅ Problem solved

Currently, I tried to build the pre-release vH39~3. However, now the ramips-m7621 target is missing.

The build failes with:

#
# configuration written to .config
#
make[1]: Leaving directory '/root/aiyion-vh39/gluon-stable-wireguard/openwrt'
Configuration failed:
 * unable to enable package 'ffda-network-setup-mode'
make: *** [Makefile:190: config] Error 1

The issue seem to be that we are trying to include this package from our site:

-- device has no reset button and requires a special package to go into setup mode
-- https://github.com/freifunk-gluon/community-packages/tree/master/ffda-network-setup-mode
if device({
'zyxel-nwa55axe',
}) then
packages {'ffda-network-setup-mode'}
end

In the first place, this only worked, since vH39-pre was built without BROKEN targets and the zyxel-nwa55axe is a broken device.

UPDATE @lemoer: Resolved in 59bae52. I built vH39~4 based on this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants