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

[23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" #6623

Merged
merged 2 commits into from
Dec 5, 2023

Conversation

mcbridematt
Copy link

@mcbridematt mcbridematt commented Oct 7, 2023

Backport d7e905e to the 23.05 branch, as armsr targets need this for a functional luci-app-attendedsysupgrade
Tested working on armsr/armv8

(change DISTRIB_RELEASE in /etc/openwrt_release to exactly either 23.05 or SNAPSHOT, as the asu server may not offer 23.05 builds from a -rc or 23.05-SNAPSHOT build)

@mcbridematt mcbridematt changed the title [23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case [23.05] backport "luci-app-attendedsysupgrade: add x86 efi/bios case" Oct 7, 2023
@McGiverGim
Copy link
Contributor

McGiverGim commented Oct 19, 2023

The "original" code has a bug, please look here: #6638

Maybe you can cherry-pick the commit.

@systemcrash
Copy link
Contributor

@mcbridematt If you can implement @McGiverGim suggestion, we can merge this.

@systemcrash systemcrash added fix pull request fixing a bug Work needed Needs work by the pullrequest creator labels Dec 4, 2023
aparcar and others added 2 commits December 5, 2023 09:07
x86 is the only target that allows you to install either EFI or BIOS
images, thereby add an extra check for that.

Signed-off-by: Paul Spooren <[email protected]>
(cherry picked from commit d7e905e)
The conditional is wrong. IndexOf returns a number and not true/false,
so it does not work.

Signed-off-by: Miguel Angel Mulero Martinez <[email protected]>
(cherry picked from commit 021c439)
@mcbridematt mcbridematt force-pushed the 23-05-backport-asu branch 2 times, most recently from 77aa27e to 4c55dc7 Compare December 5, 2023 09:09
@mcbridematt
Copy link
Author

Thanks for reminding me, I've been busy for the last few months.

Cherry picked @McGiverGim's commit on top and tested OK on armsr/armv8.

@systemcrash systemcrash merged commit 138595a into openwrt:openwrt-23.05 Dec 5, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fix pull request fixing a bug Work needed Needs work by the pullrequest creator
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants