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 21 of 2024 #858

Merged
merged 19 commits into from
May 28, 2024
Merged

Stable merge for week 21 of 2024 #858

merged 19 commits into from
May 28, 2024

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented May 24, 2024

Note: This adds OS support up to 3.3.2.1666. Due to the new toltec repositories specific to the 2.x and 3.x OS versions being added, you will need to run opkg update && opkg upgrade a second time to complete the full upgrade.


New Packages

Updated Packages

Tooling

Documentation

Packages removed

  • The following packages have been removed for any device running OS 3.x, but are still available for devices running OS 2.x:
    • remarkable-stylus
    • gocryptfs
    • innernet-client
    • linux-mainline
    • ddvk-hacks
    • fuse
    • wireguard
    • open-remarkable-shutdown

HookedBehemoth and others added 16 commits May 23, 2024 19:43
- Port 3.11 and c-string fixes from toltecmk
- Add rmallos2, rmallos3, rm1os2, rm1os3, rm2os2, and rm2os3 archs for limiting packages to only supporting those versions
- Update documentation
- Update known issues packages to only be for 2.x
- Make toltec-base generate a package for each arch to make sure that the folders always get created
- Added experimental toltec branch for testing purposes. You need to add the experimental tag to a PR, and it will start applying changes to the experimental branch.
- Fix various issues with the install and reenable process
- Update toltecctl output to use the same logging as bootstrap

---------

Co-authored-by: Mattéo Delabre <[email protected]>
Co-authored-by: Mattéo Delabre <[email protected]>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* Add package: webinterface-localhost

* enable automatically

---------

Co-authored-by: Nathaniel van Diepen <[email protected]>
* Update KOReader to v2024.03

* Update KOReader to v2024.03.1

* Update KOReader to v2024.04
Allow disabling rm2fb-client with the RM2FB_DISABLE environment variable
* Add support for rm-sync in xochitl package

Recent xochitl versions renamed the sync service and binary to rm-sync.
This updates the xochitl package to support both.

* Use file checks to determine rm-sync vs sync

* Update package/xochitl/package

Co-authored-by: Nathaniel van Diepen <[email protected]>

* Update to use new disable-unit method

* Update package

* Update package version

* Fix unit-exists

---------

Co-authored-by: Nathaniel van Diepen <[email protected]>
* Remove packages that don't work on os3

* Remove with toltec-deletions as well
* Add zerotier packages

* Add zerotier wrapper package

* Update examples in the doc

* Make link happy

* Fix doc files to update

* Add epoch to zerotier wrapper package

* Update to 1.12.0

* Update zerotier-one to 1.12.1

* Update To 1.12.2

* Update to use new disable-unit method
* Add new rcctl and systemd template for entware services
* Add launcherctl and oxide configuration

* Install launcherctl by default

* Format fix

* Add remux, koreader, xochitl, and draft to launcherctl

* Format fix

* Format fix

* Fix up install/uninstall

* Format fixes

* More format fixes

* More format fixes

* Fix up draft handling

* Fix switch-launcher without --start

* Fix install paths

* Update package

* Bump koreader rel

* Bump remux rel

* Bump toltec-base rel

* Bump toltec-completion rel

* Add missing SKIP from merge
* Fix launcherctl registrations

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package

* Update package
* Remove remarkable-stylus from os3 for now
* Use systemctl to reboot

I've been getting errors that reboot isn't found

* Update toltec-bootstrap version
@Eeems Eeems added the merge Weekly merge of the testing branch into the stable branch label May 24, 2024
@Eeems Eeems marked this pull request as ready for review May 24, 2024 02:21
@Eeems
Copy link
Member Author

Eeems commented May 24, 2024

The https://toltec-dev/stable/Compatibility link isn't live until this has been merged, you can look at https://toltec-dev/testing/Compatibility instead if you would like to inspect it. That or the raw file: https://github.com/toltec-dev/toltec/blob/testing/package/Compatibility

@Eeems

This comment was marked as resolved.

* Fix launcherctl script locations
@StachuDotNet
Copy link

StachuDotNet commented May 25, 2024

Log of my testing.
System: rM2, OS 3.3.2.1666
I've previously set up toltec with an unofficial build, per instructions in Discord, and this effort is based on that.

log
reMarkable: ~/ opkg -v
opkg version d038e5b6d155784575f62a66a8bb7e874173e92e (2022-02-24)
reMarkable: ~/ toltecctl switch-branch testing
Using packages from the testing branch may cause breakage or data loss.
Please make sure you read the following before switching to testing:

  <https://github.com/toltec-dev/toltec/blob/stable/docs/branches.md>

Continue? [y/N] y
Your Opkg configuration changed. Reload it? [Y/n] 

Downloading https://bin.entware.net/armv7sf-k3.2/Packages.gz
Updated list of available packages in /opt/var/opkg-lists/entware
Downloading https://toltec-dev.org/testing/rmall/Packages.gz
Updated list of available packages in /opt/var/opkg-lists/toltec-rmall
Downloading https://toltec-dev.org/testing/rm2/Packages.gz
Updated list of available packages in /opt/var/opkg-lists/toltec-rm2
reMarkable: ~/ opkg update
Downloading https://bin.entware.net/armv7sf-k3.2/Packages.gz
Updated list of available packages in /opt/var/opkg-lists/entware
Downloading https://toltec-dev.org/testing/rmall/Packages.gz
Updated list of available packages in /opt/var/opkg-lists/toltec-rmall
Downloading https://toltec-dev.org/testing/rm2/Packages.gz
Updated list of available packages in /opt/var/opkg-lists/toltec-rm2
reMarkable: ~/ opkg upgrade
Upgrading puzzles on root from 0.2.2-4 to 0.2.4-4...
Downloading https://toltec-dev.org/testing/rmall/puzzles_0.2.4-4_rmall.ipk
Upgrading terminfo on root from 6.4-2 to 6.4-2a...
Downloading https://bin.entware.net/armv7sf-k3.2/terminfo_6.4-2a_armv7-3.2.ipk
Upgrading zoneinfo-europe on root from 2023c-2 to 2024a-1...
Downloading https://bin.entware.net/armv7sf-k3.2/zoneinfo-europe_2024a-1_armv7-3.2.ipk
Upgrading python3-urllib on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-urllib_3.11.7-1_armv7-3.2.ipk
Upgrading python3-light on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-light_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/syslog.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/grp.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_datetime.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_json.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/xxlimited.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_bisect.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/binascii.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_statistics.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/audioop.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_opcode.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/resource.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_csv.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_asyncio.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/fcntl.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_queue.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_bz2.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_struct.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/cmath.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_contextvars.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_zoneinfo.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_crypt.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/array.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_posixshmem.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_sha512.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/termios.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_md5.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/ossaudiodev.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_socket.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_pickle.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/select.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/mmap.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_sha3.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_sha1.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/xxlimited_35.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_sha256.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_typing.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_multibytecodec.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_random.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_xxsubinterpreters.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/zlib.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_posixsubprocess.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_heapq.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/spwd.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/math.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_blake2.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_lsprof.cpython-311.so.
Upgrading jq on root from 1.6-2 to 1.7.1-1...
Downloading https://bin.entware.net/armv7sf-k3.2/jq_1.7.1-1_armv7-3.2.ipk
Upgrading sudoku on root from 0.1.1-1 to 0.1.2-1...
Downloading https://toltec-dev.org/testing/rmall/sudoku_0.1.2-1_rmall.ipk
Upgrading asciinema on root from 2.3.0-1 to 2.4.0-1...
Downloading https://bin.entware.net/armv7sf-k3.2/asciinema_2.4.0-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/site-packages/asciinema-2.3.0.dist-info/RECORD.
Removing obsolete file /opt/lib/python3.11/site-packages/asciinema-2.3.0.dist-info/METADATA.
Removing obsolete file /opt/lib/python3.11/site-packages/asciinema-2.3.0.dist-info/WHEEL.
Removing obsolete file /opt/lib/python3.11/site-packages/asciinema-2.3.0.dist-info/LICENSE.
Removing obsolete file /opt/lib/python3.11/site-packages/asciinema-2.3.0.dist-info/top_level.txt.
Removing obsolete file /opt/lib/python3.11/site-packages/asciinema-2.3.0.dist-info/entry_points.txt.
Upgrading python3-pydoc on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-pydoc_3.11.7-1_armv7-3.2.ipk
Upgrading liblzma on root from 5.4.4-1 to 5.4.6-1...
Downloading https://bin.entware.net/armv7sf-k3.2/liblzma_5.4.6-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/liblzma.so.5.4.4.
Upgrading libcurl on root from 8.2.1-1 to 8.6.0-1...
Downloading https://bin.entware.net/armv7sf-k3.2/libcurl_8.6.0-1_armv7-3.2.ipk
Upgrading toltec-bootstrap on root from 0.2.3-1 to 0.4.1-1...
Downloading https://toltec-dev.org/testing/rmall/toltec-bootstrap_0.4.1-1_rmall.ipk
Upgrading python3-email on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-email_3.11.7-1_armv7-3.2.ipk
Upgrading neofetch on root from 1.1.0-1 to 1.1.1-1...
Downloading https://toltec-dev.org/testing/rmall/neofetch_1.1.1-1_rmall.ipk
Upgrading grep on root from 3.8-2 to 3.11-1...
Downloading https://bin.entware.net/armv7sf-k3.2/grep_3.11-1_armv7-3.2.ipk
Upgrading zoneinfo-asia on root from 2023c-2 to 2024a-1...
Downloading https://bin.entware.net/armv7sf-k3.2/zoneinfo-asia_2024a-1_armv7-3.2.ipk
Upgrading xochitl on root from 0.0.0-17 to 0.0.0-20...
Downloading https://toltec-dev.org/testing/rmall/xochitl_0.0.0-20_rmall.ipk
Removing obsolete file /etc/systemd/system/manual-sync.service.
Upgrading python3-cgitb on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-cgitb_3.11.7-1_armv7-3.2.ipk
Upgrading python3-decimal on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-decimal_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_decimal.cpython-311.so.
Upgrading python3-uuid on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-uuid_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_uuid.cpython-311.so.
Upgrading python3-xml on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-xml_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_elementtree.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/pyexpat.cpython-311.so.
Upgrading libpython3 on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/libpython3_3.11.7-1_armv7-3.2.ipk
Upgrading nmap on root from 7.93-2 to 7.93-4...
Downloading https://bin.entware.net/armv7sf-k3.2/nmap_7.93-4_armv7-3.2.ipk
Upgrading zoneinfo-core on root from 2023c-2 to 2024a-1...
Downloading https://bin.entware.net/armv7sf-k3.2/zoneinfo-core_2024a-1_armv7-3.2.ipk
Upgrading remind on root from 04.02.05-1 to 04.02.09-1...
Downloading https://bin.entware.net/armv7sf-k3.2/remind_04.02.09-1_armv7-3.2.ipk
Upgrading python3-ncurses on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-ncurses_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_curses_panel.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_curses.cpython-311.so.
Upgrading python3-distutils on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-distutils_3.11.7-1_armv7-3.2.ipk
Upgrading python3-codecs on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-codecs_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_codecs_cn.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/unicodedata.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_codecs_hk.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_codecs_jp.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_codecs_iso2022.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_codecs_tw.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_codecs_kr.cpython-311.so.
Upgrading rm2fb-client on root from 1:0.0.32-2 to 1:0.0.33-1...
Downloading https://toltec-dev.org/testing/rm2/rm2fb-client_1_0.0.33-1_rm2.ipk
Upgrading rm2fb-client on root from 1:0.0.32-2 to 1:0.0.33-1...
Upgrading display on root from 1:0.0.32-2 to 1:0.0.33-1...
Downloading https://toltec-dev.org/testing/rm2/display_1_0.0.33-1_rm2.ipk
Upgrading python3-multiprocessing on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-multiprocessing_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_multiprocessing.cpython-311.so.
Upgrading simple on root from 0.2.0-2 to 0.2.1-1...
Downloading https://toltec-dev.org/testing/rmall/simple_0.2.1-1_rmall.ipk
Upgrading libncurses-dev on root from 6.4-2 to 6.4-2a...
Downloading https://bin.entware.net/armv7sf-k3.2/libncurses-dev_6.4-2a_armv7-3.2.ipk
Removing obsolete file /opt/bin/clear.
Removing obsolete file /opt/bin/reset.
Upgrading libuuid on root from 2.39-2 to 2.39.3-1...
Downloading https://bin.entware.net/armv7sf-k3.2/libuuid_2.39.3-1_armv7-3.2.ipk
Upgrading python3-base on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-base_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/_sysconfigdata.pyc.
Upgrading python3 on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3_3.11.7-1_armv7-3.2.ipk
Upgrading harmony on root from 0.2.2-2 to 0.2.3-1...
Downloading https://toltec-dev.org/testing/rmall/harmony_0.2.3-1_rmall.ipk
Upgrading entware-release on root from 1.0-2 to 2024.02-1...
Downloading https://bin.entware.net/armv7sf-k3.2/entware-release_2024.02-1_all.ipk
Upgrading python3-sqlite3 on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-sqlite3_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_sqlite3.cpython-311.so.
Upgrading python3-readline on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-readline_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/readline.cpython-311.so.
Upgrading perl on root from 5.28.1-9 to 5.38.2-1...
Downloading https://bin.entware.net/armv7sf-k3.2/perl_5.38.2-1_armv7-3.2.ipk
Removing obsolete file /opt/bin/perl5.28.1.
Removing obsolete file /opt/lib/perl5/5.28/CORE/libperl.so.
Upgrading libncurses on root from 6.4-2 to 6.4-2a...
Downloading https://bin.entware.net/armv7sf-k3.2/libncurses_6.4-2a_armv7-3.2.ipk
Upgrading icu on root from 73.2-1 to 74.2-1...
Downloading https://bin.entware.net/armv7sf-k3.2/icu_74.2-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/libicuuc.so.73.2.
Removing obsolete file /opt/lib/libicui18n.so.73.
Removing obsolete file /opt/lib/libicuuc.so.73.
Removing obsolete file /opt/lib/libicutu.so.73.2.
Removing obsolete file /opt/lib/libicutest.so.73.
Removing obsolete file /opt/lib/libicudata.so.73.2.
Removing obsolete file /opt/lib/libicui18n.so.73.2.
Removing obsolete file /opt/lib/libicutu.so.73.
Removing obsolete file /opt/lib/libicudata.so.73.
Removing obsolete file /opt/lib/libicutest.so.73.2.
Removing obsolete file /opt/lib/libicuio.so.73.2.
Removing obsolete file /opt/lib/libicuio.so.73.
Upgrading libuv on root from 1.45.0-1 to 1.45.0-3...
Downloading https://bin.entware.net/armv7sf-k3.2/libuv_1.45.0-3_armv7-3.2.ipk
Upgrading python3-pip on root from 23.2.1-1 to 23.3.1-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-pip_23.3.1-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/RECORD.
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/AUTHORS.txt.
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/METADATA.
Removing obsolete file /opt/lib/python3.11/site-packages/pip/_vendor/cachecontrol/compat.pyc.
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/LICENSE.txt.
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/entry_points.txt.
Removing obsolete file /opt/lib/python3.11/site-packages/pip/_internal/utils/inject_securetransport.pyc.
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/WHEEL.
Removing obsolete file /opt/lib/python3.11/site-packages/pip-23.2.1.dist-info/top_level.txt.
Upgrading neovim on root from 0.9.1-1 to 0.9.5-1...
Downloading https://bin.entware.net/armv7sf-k3.2/neovim_0.9.5-1_armv7-3.2.ipk
Removing obsolete file /opt/share/nvim/runtime/lua/vim/_meta.lua.
Upgrading python3-dbm on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-dbm_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_gdbm.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_dbm.cpython-311.so.
Upgrading python3-openssl on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-openssl_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_ssl.cpython-311.so.
Removing obsolete file /opt/lib/python3.11/lib-dynload/_hashlib.cpython-311.so.
Upgrading zlib on root from 1.2.13-1 to 1.3.1-1...
Downloading https://bin.entware.net/armv7sf-k3.2/zlib_1.3.1-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/libz.so.1.2.13.
Upgrading libncursesw on root from 6.4-2 to 6.4-2a...
Downloading https://bin.entware.net/armv7sf-k3.2/libncursesw_6.4-2a_armv7-3.2.ipk
Upgrading remux on root from 0.2.4-2 to 0.3.0-4...
Downloading https://toltec-dev.org/testing/rmall/remux_0.3.0-4_rmall.ipk
Installing procps-ng (4.0.4-1) to root...
Downloading https://bin.entware.net/armv7sf-k3.2/procps-ng_4.0.4-1_armv7-3.2.ipk
Installing procps-ng-ps (4.0.4-1) to root...
Downloading https://bin.entware.net/armv7sf-k3.2/procps-ng-ps_4.0.4-1_armv7-3.2.ipk
Upgrading toltec-base on root from 1.2-3 to 1.3-4...
Downloading https://toltec-dev.org/testing/rm2/toltec-base_1.3-4_rm2.ipk
Upgrading python3-asyncio on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-asyncio_3.11.7-1_armv7-3.2.ipk
Upgrading htop on root from 3.2.2-1 to 3.3.0-1...
Downloading https://bin.entware.net/armv7sf-k3.2/htop_3.3.0-1_armv7-3.2.ipk
Upgrading python3-cgi on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-cgi_3.11.7-1_armv7-3.2.ipk
Upgrading tilem on root from 0.0.7-3 to 0.1.1-1...
Downloading https://toltec-dev.org/testing/rmall/tilem_0.1.1-1_rmall.ipk
Upgrading python3-logging on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-logging_3.11.7-1_armv7-3.2.ipk
Upgrading toltec-completion on root from 0.3.1-1 to 0.4.0-2...
Downloading https://toltec-dev.org/testing/rmall/toltec-completion_0.4.0-2_rmall.ipk
Upgrading python3-ctypes on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-ctypes_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_ctypes.cpython-311.so.
Upgrading yaft on root from 0.0.10-2 to 0.1.1-1...
Downloading https://toltec-dev.org/testing/rmall/yaft_0.1.1-1_rmall.ipk
Upgrading python3-lzma on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-lzma_3.11.7-1_armv7-3.2.ipk
Removing obsolete file /opt/lib/python3.11/lib-dynload/_lzma.cpython-311.so.
display (1:0.0.33-1) already install on root.
Upgrading wget-ssl on root from 1.21.3-3 to 1.21.4-1...
Downloading https://bin.entware.net/armv7sf-k3.2/wget-ssl_1.21.4-1_armv7-3.2.ipk
Upgrading libopenssl on root from 3.0.10-1 to 3.0.13-1...
Downloading https://bin.entware.net/armv7sf-k3.2/libopenssl_3.0.13-1_armv7-3.2.ipk
Upgrading python3-unittest on root from 3.11.4-1 to 3.11.7-1...
Downloading https://bin.entware.net/armv7sf-k3.2/python3-unittest_3.11.7-1_armv7-3.2.ipk
Upgrading rm2-suspend-fix on root from 0.0.0-2 to 0.0.0-3...
Downloading https://toltec-dev.org/testing/rm2/rm2-suspend-fix_0.0.0-3_rm2.ipk
Configuring rm2-suspend-fix.
Configuring toltec-completion.
Configuring toltec-bootstrap.
Your Opkg configuration has been upgraded

! The upgrade is not finished! Please run `opkg update`
! and `opkg upgrade` once more to complete it.

Configuring xochitl.
Created symlink /etc/systemd/system/multi-user.target.wants/[email protected] → /etc/systemd/system/[email protected].
Configuring display.
Configuring rm2fb-client.
Configuring puzzles.
Configuring zlib.
Configuring libopenssl.
Configuring libuv.
Configuring terminfo.
Configuring grep.
Configuring zoneinfo-core.
Configuring zoneinfo-europe.
Configuring libpython3.
Configuring python3-base.
Configuring python3-light.
Configuring python3-email.
Configuring python3-urllib.
Configuring jq.
Configuring sudoku.
Configuring libncursesw.
Configuring libncurses.
Configuring libncurses-dev.
Configuring python3-codecs.
Configuring python3-multiprocessing.
Configuring libuuid.
Configuring python3-uuid.
Configuring asciinema.
Configuring python3-pydoc.
Configuring liblzma.
Configuring libcurl.
Configuring procps-ng.
Configuring procps-ng-ps.
Configuring neofetch.

You may choose to remove ~/.config/neofetch/config.conf
in order to get the latest default config.
Configuring zoneinfo-asia.
Configuring python3-cgi.
Configuring python3-cgitb.
Configuring python3-decimal.
Configuring python3-xml.
Configuring nmap.
Configuring remind.
Configuring python3-ncurses.
Configuring python3-distutils.
Configuring simple.
Configuring python3-asyncio.
Configuring python3-ctypes.
Configuring python3-dbm.
Configuring python3-logging.
Configuring python3-lzma.
Configuring python3-openssl.
Configuring python3-readline.
Configuring python3-sqlite3.
Configuring python3-unittest.
Configuring python3.
Configuring harmony.
Configuring entware-release.
Configuring perl.
Configuring icu.
Configuring python3-pip.
Configuring neovim.
Generating tags...
Configuring remux.
//opt/lib/opkg/info/remux.postinst: line 157: launcherctl: command not found

Run the following command(s) to use remux as your launcher
launcherctl switch-launcher --start remux

Configuring htop.
Configuring tilem.
Configuring yaft.
Configuring wget-ssl.
Collected errors:
* pkg_hash_check_unresolved: cannot find dependency toltec-deletions for toltec-base
* satisfy_dependencies_for: Cannot satisfy the following dependencies for toltec-base:
*      toltec-deletions
*

So, install, at first glance, seems to be OK.
I do see some errors around setting up remux as my launcher, but the gesture works anyway.
Not sure how much those toltec-deletions things matter.

Of note: I previously (with the unofficial build) had troubles in getting borders in tmux to show up. I believe this was due to the old build using an old version of yaft. Anyway, as of this install, it's fixed. Should the 'stable merge' here also include a new version of yaft? Maybe not - I could just be more behind than I realized.

@Eeems
Copy link
Member Author

Eeems commented May 25, 2024

From the output:

Your Opkg configuration has been upgraded

! The upgrade is not finished! Please run `opkg update`
! and `opkg upgrade` once more to complete it.

Also, from the note in the PR description:

... your standard upgrade will likely instruct you to opkg update && opkg upgrade a second time to complete the full upgrade.

@StachuDotNet
Copy link

Ah yes - I didn't catch the instructions in the middle of the stdout, that noted to opkg upate and opkg upgrade. Once I did that, the launcherctl and toltec-deletions was worked out.

@Eeems
Copy link
Member Author

Eeems commented May 25, 2024

As for yaft, the last stable release pushed out 0.1.1-1

@Eeems
Copy link
Member Author

Eeems commented May 25, 2024

Ah yes - I didn't catch the instructions in the middle of the stdout, that noted to opkg upate and opkg upgrade. Once I did that, the launcherctl and toltec-deletions was worked out.

Unfortunately we have no control over when the message will be displayed in the stdout from opkg, as it completely depends on what packages you have installed, and when the toltec-bootstrap package gets upgraded in the list.

Edit: I've updated the note to indicate that you must run opkg update && opkg upgrade a second time, to make it clearer as the user is likely to miss the warning.

@StachuDotNet
Copy link

reMarkable: ~/ toltecctl status
Enabled: Yes
Supported: Yes
Branch: testing
Model: rm2
OS: 3.3.2.166

FYI

@Eeems

This comment was marked as resolved.

@Eeems Eeems merged commit 08d9f1f into stable May 28, 2024
5 checks passed
@Eeems Eeems deleted the merge/2024-W21 branch May 28, 2024 23:22
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
6 participants