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 for week 26 of 2024 #901

Merged
merged 13 commits into from
Sep 5, 2024
Merged

Stable merge for week 26 of 2024 #901

merged 13 commits into from
Sep 5, 2024

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Jun 27, 2024

New Packages

Updated Packages

Packages Removed

  • bottom - Entware now provides this package
  • ripgrep - Entware now provides this package

Tooling

* Hack together using toltecmk for the build process

* Use makefile for dependencies

* Update to python 3.12

* Fix format

* Add missing packages and ignore lint issues

* Fix lint and format

* Add missing format fix

* Update to toltecmk 0.3.0

* Fix lint

* builder.make(..., False)

* Remove more unused code

* Rename toltec_old to build and minor cleanup

* Format fix

* Add back missing method

* Whoops, forgot to stage this

* Only parse package/*/package files

* Update requirements.txt

* Update requirements.txt
@Eeems Eeems added the merge Weekly merge of the testing branch into the stable branch label Jun 27, 2024
@Eeems

This comment was marked as resolved.

Eeems and others added 11 commits June 29, 2024 01:46
* Don't overwrite other LD_PRELOAD env values
* remove ripgrep from toltec

---------

Co-authored-by: gbyl <[email protected]>
* update lf to r32

---------

Co-authored-by: gbyl <[email protected]>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* add package: bandwhich

---------

Co-authored-by: gbyl <[email protected]>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* Make 7zip a metapackage that installs 7-zip

---------

Co-authored-by: gbyl <[email protected]>
Co-authored-by: gbyl <[email protected]>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* remove package: bottom

* fix toltecctl typo

* Create opt-usr-bin.sh

---------

Co-authored-by: gbyl <[email protected]>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* [rmkit] remove rm2fb patchelf command

* [rmkit] bump package versions for a few apps

* [rmkit] update all packages

---------

Co-authored-by: okay <okay@arkose>
* Add sysfs_preload

* Remove chroot for xochitl

* Increment xochitl version

* Make tarnish depend on sysfs_preload

* Format fix

* Update package

* Update package

* Update oxide to v2.8

* Update package

* Update oxide to v2.8.1

* Resolve duplicate and missing conflicts from how-to-enable

* Format fix

* Properly ignore shutdown.target

* Update to v2.8.2

* Add non-versioned symlink to librm2fb_client.so.1

* Update package

* Update package

* Update oxide to 2.8.4
@Eeems
Copy link
Member Author

Eeems commented Jun 29, 2024

I've removed the linux-mainline commit from this merge window. We'll have to merge it next time, assuming it's fixed.

@Eeems Eeems added this to the 2024-W26 Merge Window milestone Jun 29, 2024
@Eeems Eeems marked this pull request as ready for review June 29, 2024 08:07
@Eeems Eeems merged commit dd08124 into stable Sep 5, 2024
4 checks passed
@Eeems Eeems deleted the merge/2024-W26 branch September 5, 2024 18:11
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