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

Stable merge window for week 52 of 2023 #812

Merged
merged 8 commits into from
Jan 3, 2024
Merged

Stable merge window for week 52 of 2023 #812

merged 8 commits into from
Jan 3, 2024

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Dec 31, 2023

rM-self-serve and others added 7 commits December 30, 2023 19:49
Co-authored-by: gbyl <gbyl@users.noreply.github.com>
* update lf to r31

---------

Co-authored-by: gbyl <gbyl@users.noreply.github.com>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
* Update ripgrep to 14.0.3

---------

Co-authored-by: gbyl <gbyl@users.noreply.github.com>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Co-authored-by: gbyl <gbyl@users.noreply.github.com>
* Update webinterface-upload-button to 1.1.1

---------

Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Co-authored-by: gbyl <gbyl@users.noreply.github.com>
@Eeems Eeems added the merge Weekly merge of the testing branch into the stable branch label Dec 31, 2023
@Eeems Eeems added this to the 2023-W52 Merge Window milestone Dec 31, 2023
@Eeems Eeems changed the title Merge/2023 w52 Stable merge window for week 52 of 2023 Dec 31, 2023
@Jayy001
Copy link

Jayy001 commented Dec 31, 2023

Installed and tested on 2.15.1.1189 RM2 - installed fine without any issues apart from webinterface-onboot in which I had to then manually run opkg install libbfd (but I presume thats just beacuse I manually ran opkg install on the singular .ipk package).

Tested btm, 7zz and rg - no issues and worked as intended. Also tested webinterface-upload and was able to upload a sample file, webinterface-onboot was also tested and does come on at boot. Happy to approve this.

@Eeems
Copy link
Member Author

Eeems commented Dec 31, 2023

Installed and tested on 2.15.1.1189 RM2 - installed fine without any issues apart from webinterface-onboot in which I had to then manually run opkg install libbfd (but I presume thats just beacuse I manually ran opkg install on the singular .ipk package).

That should still pull in dependencies, or fail if it can't. Looking at the package, it doesn't have an installdepends, so that's something we missed due to already having libbfd installed while testing. Automated install testing would be so nice 😔

I'll get a fix in place later today, unless @rM-self-serve beats me to it.

@rM-self-serve
Copy link
Contributor

This is likely due to /opt/bin/strings pointing to /opt/bin/binutils-strings rather than busybox but not correctly installing binutils-strings' dependencies.

@Eeems
Copy link
Member Author

Eeems commented Dec 31, 2023

This is likely due to /opt/bin/strings pointing to /opt/bin/binutils-strings rather than busybox but not correctly installing binutils-strings' dependencies.

I think adding the binutils-strings dependency will be enough to resolve this for now, but you'll probably want to update webinterface-onboot to explicitly run the non-/opt version of strings.

@rM-self-serve
Copy link
Contributor

I will do that. This is well outside of my scope but doesn't this elude to a deeper problem with packaging? Had Jay run 'strings' in the terminal it would have failed as well. May this be an upstream entware thing?

@Eeems
Copy link
Member Author

Eeems commented Dec 31, 2023

I will do that. This is well outside of my scope but doesn't this elude to a deeper problem with packaging? Had Jay run 'strings' in the terminal it would have failed as well. May this be an upstream entware thing?

This does seem to be an issue with upstream. You could look into getting upstream fixed as well if you'd like.

@Eeems Eeems merged commit fa68e4d into stable Jan 3, 2024
4 checks passed
@Eeems Eeems deleted the merge/2023-W52 branch January 3, 2024 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge Weekly merge of the testing branch into the stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants