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

luci-app-attendedsysupgrade: apply changes to package list #7610

Merged
merged 1 commit into from
Feb 8, 2025

Conversation

efahl
Copy link
Contributor

@efahl efahl commented Feb 7, 2025

Utilize the 'package_changes' from the ASU server to update the package list for the build request.

Links: openwrt/asu@2bff208


@aparcar @systemcrash Please critique these changes thoroughly, my JS experience is grossly outdated and I'm not at all confident about the stylistic choices I've made. The new function feels solid to me (except for some missing error checking), but the call sequence at the bottom seems kind of ugly.

@aparcar
Copy link
Member

aparcar commented Feb 7, 2025

Seems to work, amazing

Utilize the 'package_changes' from the ASU server to update the package list
for the build request.

Links: openwrt/asu@2bff208
Signed-off-by: Eric Fahlgren <[email protected]>
@efahl
Copy link
Contributor Author

efahl commented Feb 7, 2025

amazing

I know, right? 😂 Took me like 50 iterations reworking all that Promises.all and contents to get something that worked.

@systemcrash
Copy link
Contributor

Looks legit and clean. If it works - even better 😁

@aparcar aparcar merged commit 5a79a57 into openwrt:master Feb 8, 2025
5 checks passed
@aparcar
Copy link
Member

aparcar commented Feb 8, 2025

It should be backport to 24 and 23

@efahl efahl deleted the package-changes branch February 8, 2025 12:59
@efahl
Copy link
Contributor Author

efahl commented Feb 8, 2025

If it works - even better 😁

Alas, it does not. 😞 I just found a bug, I used firmware.version, i.e., the old one, rather than the update-to version when grabbing the revcode and package_changes. Working on it...

@efahl
Copy link
Contributor Author

efahl commented Feb 8, 2025

It should be backport to 24 and 23

24 is an easy cherrypick as we've kept it current with main.

How should I handle 23? It's way behind and has a ton of diffs, but it all appears to work if I just copy it to my 23.05.5 test box. Does a cherry pick work on all that or is there some other way to get the changes merged?

@hnyman
Copy link
Contributor

hnyman commented Feb 10, 2025

cherry-pick PR including the bug fix from #7611 (?) sounds like the natural approach for 24.10.

23.05 looks more problematic, as there are so many commits in master that have not been backported to 23.05 already earlier. Trying to backport only the latest commit might lead into new problems.

@aparcar
Copy link
Member

aparcar commented Feb 11, 2025

I'd backport it all, the state of the 23er luci app is unable to update to 24.10

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

Successfully merging this pull request may close these issues.

4 participants