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

ath79: Add support for Sophos AP15C (backport) #3369

Closed

Conversation

kpanic23
Copy link
Contributor

@kpanic23 kpanic23 commented Nov 5, 2024

Backport of #3368

@github-actions github-actions bot added 3. topic: docs Topic: Documentation 3. topic: hardware Topic: Hardware Support labels Nov 5, 2024
@herbetom
Copy link
Contributor

herbetom commented Nov 5, 2024

Hi, backports are only accepted once the change is merged into main. Once this is the case please use the -x flag while cherry picking.

@kpanic23 kpanic23 closed this Nov 5, 2024
@kpanic23
Copy link
Contributor Author

Isn't there a chicken and egg problem?
This backport is only accepted when the change is merged into main, while the merge into main is only accepted once main switches to using OpenWrt 24.xx. When main uses OpenWrt 24.xx, I can't cherry-pick into the v2023.2.x tree any more because OpenWrt 24.xx already supports the device, so the patch file is missing.

@herbetom
Copy link
Contributor

It's accecptable to modify commits / resolve conflicts while cherry picking. Ideally it should probably be noted in the commit message like so (not sure about the most common format to do it, and it's for gluon (and OpenWrt) AFAIK not an enforced policy):

(cherry picked from commit xy)
[added xy/dropped xy/...]

But here's the problem: Gluon is quite restrictive in regards to what downstream patches are accepted (rebasing and managing them is a pain for everyone). I just don't see this happening here.

Therefore i don't think Support for "Sophos AP15C" is going to happen in gluon v2023.2.x. But tbh. i also don't see the necessity in it. If you need it just add the patch as part of your communities build process. And once/if it's available in gluon you can drop it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. topic: docs Topic: Documentation 3. topic: hardware Topic: Hardware Support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants