-
Notifications
You must be signed in to change notification settings - Fork 60
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
Add support for rm-sync in xochitl package #718
Conversation
cd666ee
to
1013c33
Compare
1013c33
to
a84a4c5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@timower poke |
Recent xochitl versions renamed the sync service and binary to rm-sync. This updates the xochitl package to support both.
a84a4c5
to
e3ae2fd
Compare
@timower poke |
fcf1aa2
to
b2eaf09
Compare
Verified on 2.15 (upgrade, fresh install & remove) and 3.5 (fresh install & remove). Seems to work |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Upgrading an existing install doesn't error, but I'm left with manual-sync.service
still running and manual-sync@sync
in a failed state with the following error:
Failed to start reMarkable Document Sync without the xochitl.service dependency.
Stopping manual-sync.service
and then starting manual-sync@sync
allows them to start as expected.
I cannot build any packages locally anymore, as I'm always running into:
I tried different python versions and some docker image, without success. |
Co-authored-by: Nathaniel van Diepen <[email protected]>
Python 3.10 is currently required for the toltec build system. Toltecmk supports 3.11, but hasn't been fully updated to do everything the toltec build system does. |
@timower unfortunately preupgrade won't run when upgrading from a previous package to this package, only configure from this package runs: https://github.com/toltec-dev/toltec/blob/stable/docs/package.md#install-section @matteodelabre I'm not sure how the current pre/post upgrade scripts work makes sense as this keeps coming up. It's basically impossible to know what pre/post upgrade steps should be run until you are writing the new package. I think it might be worth us changing this longer term so that pre/post upgrade are run from package B along with configure. That or we start building some standards on what should actually be in those scripts by default in a package. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've only tested this on versions before the new rm-sync service, as that's all toltec supports at the moment. When we move to add support for 3.5+ we'll be retesting this along with other things.
* 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]>
**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 - `launcherctl` - 0.0.1-2 (#795) - Adds a new utility for managing launchers and applications. - Run `launcherctl --help` on the device for more information on how to use it. - `entware-rc` - 0.1-1 (#792) - Adds a new utility for managing services installed from the entware repository. - Run `rcctl --help` on the device for more information on how to use it. - `zerotier`, `zerotier-one`, `zerotier-one-doc`, and `zerotier-selftest` - 1.12.2-1 (#713) - `toltec-deletions` - 0.1-4 (#713 #759) - Used to remove packages from a system when upgrading/downgrading between supported OS versions - `webinterface-localhost` - 0.0.0-1 (#842) - Allows accessing the usb web interface via `http://localhost`. - Useful for exposing the usb web interface over tailscale. ### Updated Packages - `sudoku` - 0.1.2-1 (#832) - `toltec-bootstrap` - 0.4.0-1 (#849 #759) - bootstrap and toltecctl will now validate that the OS version you are running on is supported based on a compatibility table you can manually inspect at https://toltec-dev/stable/Compatibility. - `remarkable-stylus` - 0.0.3-3 (#855) - `draft` - 0.2.0-25 (#795 #857 #862) - `koreader` - 2024-04-4 (#795 #857 #838 #862) - `oxide`, `oxide-utils`, `oxide-extra`, `inject_evdev`, `liboxide`, and `liboxide-dev` - 2.7-7 (#795 #857 #862 #864) - `remux` - 0.3.0-4 (#795 #857 #862) - `xochitl` - 0.0.0-20 (#795 #857 #718 #862) - `toltec-base` - 1.3-3 (#853 #792 #795 #759) - `toltec-completion` - 0.4.0-1 (#792 #795 #759) - `gocryptfs` - 2.0-beta2-3 (#852) - `innernet-client` - 1.5.3-3 (#852) - `linux-mainline` - 6.2.0-3 (#852) - `netevent` - 2.2.2-1 (#800) - `display`, and `rm2fb-client` - 0.0.33-1 (#829) - `neofetch` - 1.1.1-1 (#843) - `ddvk-hacks` - 39.01-4 (#759) - `fuse` - 1.0.0-5 (#759) - `kernelctl` - 0.1-7 (#759) - `signature-rm` - 1.0.2-2 (#759) - `templatectl` - 0.1.3-5 (#759) - `webinterface-onboot` - 1.2.3-2 (#759) - `webinterface-upload-button` - 1.1.1-2 (#759) - `wireguard` - 1.0.20210219-5 (#759) - `open-remarkable-shutdown` - 1.0-2 (#861) ### Tooling - Build process updated to use python 3.11 (#759). - Ported c-string build fixes from toltecmk to the build process (#759). - Added support for the following new architectures to allow splitting out OS support (#759): - rmallos2 - rmallos3 - rm1os2 - rm1os3 - rm2os2 - rm2os3 - New OS compatibility table added to build process (#759). ### Documentation - Updated information on architectures to include new OS support information (#759). ### 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`
Recent xochitl versions renamed the sync service and binary to rm-sync. This updates the xochitl package to support both.