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 4 of 2024 #830

Merged
merged 14 commits into from
May 21, 2024
Merged

Stable merge for week 4 of 2024 #830

merged 14 commits into from
May 21, 2024

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Jan 28, 2024

New Packages

Updated Packages

Packages removed

  • erode, tarnish, decay, and corrupt
    • Replaced by oxide
  • fret, and anxiety
    • Replaced by oxide-extra
  • rot
    • Replaced by oxide-utils

Etn40ff and others added 12 commits January 28, 2024 16:32
* Update package and change numbering scheme

* Update timestamp

---------

Co-authored-by: Nathaniel van Diepen <[email protected]>
* Pin specific versions of folly's clang deps

* Bump version
* toltec-base: disable [email protected]

---------

Co-authored-by: gbyl <[email protected]>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* Update zoneinfo-utils to 2023c
* Update yaft to v0.1.1
* Update oxide to v2.7

* Fix #750

* Update to use new disable-unit method

* Add new liboxide-dev package
* Update puzzles to 0.2.4
* Add move-logs-to-opt
* simple: fix diacritic issues in font rendering
* genie: add config dir
* harmony: fix crash due to bad buffer
* remux: add APIs for launcher-ctrl

Co-authored-by: okay <okay@arkose>
Co-authored-by: Nathaniel van Diepen <[email protected]>
* Update tilem to v0.1.1

* Use latest build image

* Switch to git lfs

* Fix install path
* Don't error if there are no metadata files

* Update version number
@Eeems Eeems added the merge Weekly merge of the testing branch into the stable branch label Jan 28, 2024
@Eeems Eeems added this to the 2024-W04 Merge Window milestone Jan 28, 2024
@Eeems

This comment was marked as resolved.

@Eeems Eeems linked an issue Feb 14, 2024 that may be closed by this pull request
@rM-self-serve
Copy link
Contributor

Device: rM1
Version: 2.10.2.356

I am not sure if this is an issue with zoneinfo-utils or timedatectl but I am not able to set the timezone.
zoneinfo-utils2023c_rm1-v2 10 2 356
I also tried America/Bahia to no avail. Will try v2.15 soon.

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

Device: rM1 Version: 2.10.2.356

I am not sure if this is an issue with zoneinfo-utils or timedatectl but I am not able to set the timezone. zoneinfo-utils2023c_rm1-v2 10 2 356 I also tried America/Bahia to no avail. Will try v2.15 soon.

Could you double-check to make sure that the bind mount is active?

add-bind-mount /home/root/.entware/share/zoneinfo \
/usr/share/zoneinfo

Timedatectl will list the full list, even if they aren't available. That said, installing this will make more available. By default, it'll just install zoneinfo-core, so you may need to also install one of the other zoneinfo-*packages (https://remarkable.guide/guide/config/timezone.html#available-timezones).

@rM-self-serve
Copy link
Contributor

Looks like it is. I will look further into it.

zoneinfo-mount

@rM-self-serve
Copy link
Contributor

It set Europe/London fine so no worries.

@rM-self-serve
Copy link
Contributor

Device: rM1
Version: 2.10.2.356

Genie does not seem to be able to load the config at /opt/etc/genie.conf
genie-0 1 7-1_rm1-2 10

I also tried ~/.config/genie/genie.conf to no avail.

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

Device: rM1 Version: 2.10.2.356

Genie does not seem to be able to load the config at /opt/etc/genie.conf genie-0 1 7-1_rm1-2 10

I also tried ~/.config/genie/genie.conf to no avail.

Have you put config in /opt/etc/genie.conf yet? The package only creates /opt/etc/genie.example.conf, and assumes that the user will create a configuration file.

@rM-self-serve
Copy link
Contributor

Yeah you can see the contents in the screenshot

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

Yeah you can see the contents in the screenshot

Apologies, it's late. Have you tried running the genie service instead of running it by hand?

@rM-self-serve
Copy link
Contributor

That works just fine, looks like the config path needs to follow the command if it is not in the current directory.

Via genie.service ExecStart=/opt/bin/genie /opt/etc/genie.conf

@rM-self-serve
Copy link
Contributor

rM-self-serve commented Apr 22, 2024

Oxide seems to be failing while upgrading due to fret. I did a fresh install of oxide 2.6-3 from the stable toltec repo and had it working fine. Then I added the testing packages to a local repo. When installing oxide 2.7-3, it seems to have an issue with fret.

I will also mention I installed the .ipk from .cache before configuring the local repo and in that case I had issues with fret as well, where I had to remove it manually.

oxide_upgrade

Oxide still seems to work fine and then I can remove fret no problem.

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

Oxide seems to be failing while upgrading due to fret. I did a fresh install of oxide 2.6-3 from the stable toltec repo and had it working fine. Then I added the testing packages to a local repo. When installing oxide 2.7-3, it seems to have an issue with fret.

I will also mention I installed the .ipk from .cache before configuring the local repo and in that case I had issues with fret as well, where I had to remove it manually.

oxide_upgrade

Oxide still seems to work fine and then I can remove fret no problem.

I see that you are "upgrading" by telling it to install the oxide package. Could you try this test by doing the recommended full system upgrade, so that all package updates can be processed at once? https://remarkable.guide/guide/software/toltec.html#updating-your-installation

@rM-self-serve
Copy link
Contributor

Here is the output from an upgrade, still seem to be catching some error with fret.

reMarkable: ~/ opkg upgrade
Upgrading genie on root from 0.1.6-3 to 0.1.7-1...
Downloading file:///home/root/packages/local/rmall/genie_0.1.7-1_rmall.ipk
Upgrading oxide-utils on root from 2.6-3 to 2.7-3...
Downloading file:///home/root/packages/local/rmall/oxide-utils_2.7-3_rmall.ipk
Installing libpython3 (3.11.7-1) to root...
...
Installing reboot-guard (1.0.1-8) to root...
Downloading https://toltec-dev.org/stable/rmall/reboot-guard_1.0.1-8_rmall.ipk
Upgrading liboxide on root from 2.6-3 to 2.7-3...
Downloading file:///home/root/packages/local/rmall/liboxide_2.7-3_rmall.ipk
Removing obsolete file /opt/lib/libliboxide.so.2.6.0.
Removing obsolete file /opt/lib/libliboxide.so.2.6.
Upgrading oxide-utils on root from 2.6-3 to 2.7-3...
Removing package rot from root...
Upgrading oxide on root from 2.6-3 to 2.7-3...
Downloading file:///home/root/packages/local/rmall/oxide_2.7-3_rmall.ipk
Removing package decay from root...
Reloading Oxide applications: Done!
Removing package tarnish from root...
Stopping tarnish.service
Disabling tarnish.service
Removed /etc/systemd/system/multi-user.target.wants/tarnish.service.
Removed /etc/systemd/system/launcher.service.
Removing package erode from root...
Upgrading zoneinfo-utils on root from 2021a-2 to 2023c-1...
Downloading file:///home/root/packages/local/rmall/zoneinfo-utils_2023c-1_rmall.ipk
Upgrading oxide-extra (2.7-3) to root...
Downloading file:///home/root/packages/local/rmall/oxide-extra_2.7-3_rmall.ipk
Removing package fret from root...
oxide (2.7-3) already install on root.
Upgrading iago on root from 0.1.1-2 to 0.1.2-1...
Downloading file:///home/root/packages/local/rmall/iago_0.1.2-1_rmall.ipk
Upgrading rmfakecloud-proxy on root from 0.0.3-4 to 0.0.3-5...
Downloading file:///home/root/packages/local/rmall/rmfakecloud-proxy_0.0.3-5_rmall.ipk
Upgrading koreader on root from 2023.10-2 to 2024.01-1...
Downloading file:///home/root/packages/local/rmall/koreader_2024.01-1_rmall.ipk
Removing obsolete file /opt/koreader/libs/libutf8proc.so.2.
Removing obsolete file /opt/koreader/libs/libcrengine.so.
Removing obsolete file /opt/koreader/libs/libglib-2.0.so.0.
Upgrading simple on root from 0.2.0-2 to 0.2.1-1...
Downloading file:///home/root/packages/local/rmall/simple_0.2.1-1_rmall.ipk
Upgrading linux-stracciatella on root from 5.4.70-3 to 5.4.70.4-1...
Downloading file:///home/root/packages/local/rm1/linux-stracciatella_5.4.70.4-1_rm1.ipk
Removing obsolete file /opt/usr/share/kernelctl/stracciatella-5.4.70.tar.bz2.
Upgrading harmony on root from 0.2.2-2 to 0.2.3-1...
Downloading file:///home/root/packages/local/rmall/harmony_0.2.3-1_rmall.ipk
oxide-utils (2.7-3) already install on root.
oxide (2.7-3) already install on root.
oxide (2.7-3) already install on root.
liboxide (2.7-3) already install on root.
Upgrading remux on root from 0.2.4-2 to 0.3.0-1...
Downloading file:///home/root/packages/local/rmall/remux_0.3.0-1_rmall.ipk
Upgrading toltec-base on root from 1.2-3 to 1.3-1...
Downloading file:///home/root/packages/local/rm1/toltec-base_1.3-1_rm1.ipk
Upgrading tilem on root from 0.0.7-3 to 0.1.1-1...
Downloading file:///home/root/packages/local/rmall/tilem_0.1.1-1_rmall.ipk
Upgrading yaft on root from 0.0.10-2 to 0.1.1-1...
Downloading file:///home/root/packages/local/rmall/yaft_0.1.1-1_rmall.ipk
oxide (2.7-3) already install on root.
Configuring toltec-base.
Disabling automatic update
Disabling usb1 network device to avoid long boots
Created symlink /etc/systemd/system/[email protected] → /dev/null.
Configuring genie.
Run 'systemctl enable genie --now' to enable genie
Configuring libpython3.
Configuring python3-base.
Configuring libbz2.
Configuring python3-light.
Configuring python3-asyncio.
Configuring python3-email.
Configuring python3-cgi.
Configuring python3-pydoc.
Configuring python3-cgitb.
Configuring python3-codecs.
Configuring libffi.
Configuring python3-ctypes.
Configuring libgdbm.
Configuring python3-dbm.
Configuring python3-decimal.
Configuring python3-distutils.
Configuring python3-logging.
Configuring liblzma.
Configuring python3-lzma.
Configuring python3-multiprocessing.
Configuring python3-ncurses.
Configuring python3-openssl.
Configuring libreadline.
Configuring python3-readline.
Configuring libsqlite3.
Configuring python3-sqlite3.
Configuring python3-unittest.
Configuring python3-urllib.
Configuring libuuid.
Configuring python3-uuid.
Configuring python3-xml.
Configuring python3.
Configuring reboot-guard.
Configuring liboxide.
Configuring oxide.

Run the following command(s) to use oxide as your launcher
$ systemctl enable --now tarnish

Configuring oxide-utils.
Configuring zoneinfo-utils.
Bind mount configuration for '/usr/share/zoneinfo' already exists, updating
Configuring oxide-extra.
Configuring iago.
Configuring rmfakecloud-proxy.
Status: disabled (inactive)
Upstream server: (not set)
Run `rmfakecloudctl enable` to enable rmfakecloud-proxy.
Run `rmfakecloudctl set-upstream https://<server>` to set the upstream server.
Configuring koreader.

Run the following command(s) to use koreader as your launcher
$ systemctl enable --now koreader

Configuring simple.
Configuring linux-stracciatella.
The new kernel files have been copied, but not installed.
Please use kernelctl to select the kernel to boot.
Configuring harmony.
Configuring remux.

Run the following command(s) to use remux as your launcher
$ systemctl enable --now remux

Configuring tilem.
Configuring yaft.
Collected errors:
 * pkg_hash_check_unresolved: cannot find dependency fret (= 2.6-3) for oxide
reMarkable: ~/ 

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

This is very odd as the oxide package no longer depends on fret. It's been removed and replaced with oxide-extra, as expected.

What does opkg info oxide output? As well as, does opkg configure fail with the dependency issue again?

@rM-self-serve
Copy link
Contributor

No errors on opkg configure.

reMarkable: ~/ opkg info oxide
Package: oxide
Version: 2.6-3
Depends: erode (= 2.6-3), rot (= 2.6-3), liboxide (= 2.6-3), fret (= 2.6-3), decay (= 2.6-3), libsentry (= 0.5.0), tarnish (= 2.6-3), rm2fb-client, oxide-utils (= 2.6-3)
Status: unknown ok not-installed
Section: launchers
Architecture: rmall
Maintainer: Eeems <[email protected]>
Size: 1122731
Filename: oxide_2.6-3_rmall.ipk
Description: Launcher application

Package: oxide
Version: 2.7-3
Depends: libsentry (= 0.5.0), reboot-guard, liboxide (= 2.7-3), oxide-utils (= 2.7-3), rm2fb-client
Replaces: decay, tarnish, erode, corrupt
Conflicts: decay, tarnish, erode, corrupt
Status: install user installed
Section: launchers
Architecture: rmall
Maintainer: Eeems <[email protected]>
Size: 2452843
Filename: oxide_2.7-3_rmall.ipk
Description: Launcher application
Installed-Time: 1713821035

reMarkable: ~/ opkg configure
reMarkable: ~/ 

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

So there are two oxide entires, likely one for each repo. The one that's marked as installed doesn't depend on fret though. This may be an opkg bug that wont be an issue when there is only one source for oxide. I'm suprised this is the first time we've encountered this. Could you try commenting out the toltec repos from your opkg.conf.d entry, then rebuild the opkg.conf and try again to see if it's because of the dual entries?

@rM-self-serve
Copy link
Contributor

I commented out the toltec repos and no longer see the error, that seemed to work.

@Eeems
Copy link
Member Author

Eeems commented Apr 22, 2024

I commented out the toltec repos and no longer see the error, that seemed to work.

Alright, so users will not encounter this. It's rather annoying to properly test this kind of thing though. I may have to take some time to document how to get a full copy of the local repo setup on a host machine to test with, instead of copying just the changed files to the tablet and using a localrepo there.

@rM-self-serve
Copy link
Contributor

rM-self-serve commented Apr 23, 2024

Packages were upgraded from a local repo on v2.15 then reenabled on v2.10.

package notes pass
move-logs-to-opt contains 20K of data yes
oxide-extra, liboxide-dev, oxide, oxide-utils, inject_evdev, liboxide set as launcher, killed process in manager, set timezone yes
folly passed the tutorial yes
koreader opened epub and pdf files yes
linux-stracciatella plugged in keyboard yes
puzzles played train track game yes
genie observed output from swipe yes
harmony drew a picture yes
iago drew a rectangle yes
remux launched/killed programs yes
simple ran nao yes
tilem characters blink when entered but same behavior as last version yes
yaft ran neofetch yes
zoneinfo-utils changed timezones and observed long list of zones yes
toltec-base ran toltec reenable yes
rm2-suspend-fix can't test n/a
rmfakecloud-proxy enabled and disabled, can't test server compatibility n/a

@Eeems
Copy link
Member Author

Eeems commented May 20, 2024

I've gone through a fresh install of 2.15 and toltec on my rM2 and then ran through an update and double-checked rm2-suspend-fix and rmfakecloud-proxy. This should be good to merge.

@Eeems Eeems merged commit 80ec826 into stable May 21, 2024
3 checks passed
@Eeems Eeems deleted the merge/2024-W04 branch May 21, 2024 01:02
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.

Folly build broken
6 participants