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.

Sign up for GitHub

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

Jump to bottom

Make sure xochtil shows up properly when run #707

Merged
merged 8 commits into from
Nov 12, 2023
Merged

Make sure xochtil shows up properly when run #707

merged 8 commits into from
Nov 12, 2023

Conversation

Eeems
Copy link
Member

@Eeems Eeems commented Jul 19, 2023

This make sure that xochitl properly shows up as /usr/bin/xochtil when you run it using the wrapper script.

@Eeems Eeems added the packages Add or improve packages of the repository label Jul 19, 2023
@Eeems Eeems marked this pull request as ready for review July 19, 2023 03:26
@Eeems Eeems added this to the 2023-W31 merge window milestone Jul 26, 2023
@TheSunCat
Copy link

I installed the xochitl_0.0.0-15_rmall.ipk package from the artifacts, and ran xochitl from the ssh prompt (which resolves to /opt/bin/xochitl according to which xochitl). I then checked with ps | grep xo which shows the correct path in my new process (the second one):

root@reMarkable:~# ps | grep xo
 6858 root      270m S    /usr/bin/xochitl
13930 root      251m S    /usr/bin/xochitl

@Eeems Eeems merged commit 1e90b51 into testing Nov 12, 2023
3 checks passed
@Eeems Eeems deleted the Eeems-patch-11 branch November 12, 2023 18:28
Eeems added a commit that referenced this pull request Nov 22, 2023
@Eeems
Make sure xochtil shows up properly when run (#707)
05b766e 
* Make sure xochtil shows up properly when run
@Eeems Eeems mentioned this pull request Nov 24, 2023
Merged
Eeems added a commit that referenced this pull request Dec 6, 2023
@Eeems
Stable merge window for week 47 of 2023 (#754)
231fc3a 
### New Packages
- `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712)
- `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724)
  - Installing a splashscreen will automatically enable it
  - Removing a splashscreen will automatically revert to the previous splashscreen

### Updated Packages
- `toltec-bootstrap` - 0.2.3-1 (#740)
- `rmfm` - 1.5.0-2 (#700 #746)
- `whiteboard-hypercard` - 0.3.7-2 (#700 #747)
- `yaft` - 0.0.10-2 (#700 #736)
- `xochitl` - 0.0.0-16 (#700 #707)
- `reboot-guard` - 1.0.1-7 (#689)
- `calculator` - 0.0.0-16 (#700)
- `chessmarkable` - 0.8.0-2 (#700)
- `doomarkable` - 0.4.1-2 (#700)
- `fingerterm` - 1.3.5-15 (#700)
- `keywriter` - 0.2~20-gddc9e73-2 (#700)
- `koreader` - 2023.08-2 (#700)
- `netsurf` - 0.4.0-3 (#700)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745)
- `plato` - 0.9.34-2 (#700)
- `puzzles` - 0.2.2-4 (#700)
- `recrossable` - 0.0.0-8 (#700)
- `regenda` - 0.0.2-2 (#700)
- `reterm` - 20230628.1927-2 (#700)
- `retris` - 0.6.3-4 (#700)
- `dumbskull` - 0.0.1-3 (#700)
- `harmony` - 0.2.2-2 (#700)
- `mines` - 0.1.4-3 (#700)
- `nao` - 0.1.2-4 (#700)
- `rpncalc` - 0.0.3-3 (#700)
- `wordlet` - 0.0.2-3 (#700)
- `sill` - 0.1.1-1 (#700)
- `vnsee` - 0.4.1-2 (#700)
- `wikipedia` - 0.1.0-4 (#700)
- `zshelf` - 0.4.0-4 (#700)
- `changescrn` - 1.0.0-2 (#724)

### Tooling
- Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove.

### Documentation
- Add documentation for the reload-oxide-apps hook.
- Update category list to include the new splashscreens category.

### Known Issues
- lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7)
- Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761)
- Fingerterm icon is incorrect (#762)
@Eeems Eeems mentioned this pull request Dec 6, 2023
Merged
Eeems added a commit that referenced this pull request Dec 6, 2023
@Eeems
Move release information to environment variables (#773) (#774)
3a258ae 
### New Packages
- `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712)
- `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724)
  - Installing a splashscreen will automatically enable it
  - Removing a splashscreen will automatically revert to the previous splashscreen

### Updated Packages
- `toltec-bootstrap` - 0.2.3-1 (#740)
- `rmfm` - 1.5.0-2 (#700 #746)
- `whiteboard-hypercard` - 0.3.7-2 (#700 #747)
- `yaft` - 0.0.10-2 (#700 #736)
- `xochitl` - 0.0.0-16 (#700 #707)
- `reboot-guard` - 1.0.1-7 (#689)
- `calculator` - 0.0.0-16 (#700)
- `chessmarkable` - 0.8.0-2 (#700)
- `doomarkable` - 0.4.1-2 (#700)
- `fingerterm` - 1.3.5-15 (#700)
- `keywriter` - 0.2~20-gddc9e73-2 (#700)
- `koreader` - 2023.08-2 (#700)
- `netsurf` - 0.4.0-3 (#700)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745)
- `plato` - 0.9.34-2 (#700)
- `puzzles` - 0.2.2-4 (#700)
- `recrossable` - 0.0.0-8 (#700)
- `regenda` - 0.0.2-2 (#700)
- `reterm` - 20230628.1927-2 (#700)
- `retris` - 0.6.3-4 (#700)
- `dumbskull` - 0.0.1-3 (#700)
- `harmony` - 0.2.2-2 (#700)
- `mines` - 0.1.4-3 (#700)
- `nao` - 0.1.2-4 (#700)
- `rpncalc` - 0.0.3-3 (#700)
- `wordlet` - 0.0.2-3 (#700)
- `sill` - 0.1.1-1 (#700)
- `vnsee` - 0.4.1-2 (#700)
- `wikipedia` - 0.1.0-4 (#700)
- `zshelf` - 0.4.0-4 (#700)
- `changescrn` - 1.0.0-2 (#724)

### Tooling
- Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove.

### Documentation
- Add documentation for the reload-oxide-apps hook.
- Update category list to include the new splashscreens category.

### Known Issues
- lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7)
- Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761)
- Fingerterm icon is incorrect (#762)
@Eeems Eeems mentioned this pull request Dec 6, 2023
Merged
Eeems added a commit that referenced this pull request Dec 6, 2023
@Eeems
Stable merge window for week 47 of 2023
37e693f 
### New Packages
- `template-daily-planner`, `template-weekly-planner`, `template-journal`, `template-meeting-notes`, `template-smart-goals`, and `template-good-time-journal` - 0.0.0-1 (#712)
- `splashscreen-starting-wavey-lines`, `splashscreen-suspended-wavey-lines`, `splashscreen-poweroff-gallifreyan`, `splashscreen-suspended-gallifreyan`, `splashscreen-suspended-gallifreyan-dark`, `splashscreen-starting-gallifreyan`, `splashscreen-suspended-gallifreyan-2`, `splashscreen-suspended-flower-pause`, `splashscreen-batteryempty-barnsley_fern`, `splashscreen-poweroff-barnsley_fern`, `splashscreen-starting-barnsley_fern`, `splashscreen-suspended-barnsley_fern`, `splashscreen-batteryempty-chaotic_ribbon`, `splashscreen-poweroff-chaotic_ribbon`, `splashscreen-starting-chaotic_ribbon`, `splashscreen-suspended-chaotic_ribbon`, `splashscreen-batteryempty-collatz_sea_weed`, `splashscreen-poweroff-collatz_sea_weed`, `splashscreen-starting-collatz_sea_weed`, `splashscreen-suspended-collatz_sea_weed`, `splashscreen-batteryempty-dragon_curve`, `splashscreen-poweroff-dragon_curve`, `splashscreen-starting-dragon_curve`, `splashscreen-suspended-dragon_curve`, `splashscreen-batteryempty-fire`, `splashscreen-poweroff-fire`, `splashscreen-starting-fire`, `splashscreen-suspended-fire`, `splashscreen-batteryempty-fractal_tree`, `splashscreen-poweroff-fractal_tree`, `splashscreen-starting-fractal_tree`, `splashscreen-suspended-fractal_tree`, `splashscreen-batteryempty-sacks_spiral`, `splashscreen-poweroff-sacks_spiral`, `splashscreen-starting-sacks_spiral`, `splashscreen-suspended-sacks_spiral`, `splashscreen-batteryempty-sierpinski_triangle`, `splashscreen-poweroff-sierpinski_triangle`, `splashscreen-starting-sierpinski_triangle`, `splashscreen-suspended-sierpinski_triangle`, `splashscreen-batteryempty-snowy_hills`, `splashscreen-poweroff-snowy_hills`, `splashscreen-starting-snowy_hills`, `splashscreen-suspended-snowy_hills`, `splashscreen-batteryempty-starr`, `splashscreen-poweroff-starr`, `splashscreen-starting-starr`, and `splashscreen-suspended-starr` - 0.0.0-1 (#724)
  - Installing a splashscreen will automatically enable it
  - Removing a splashscreen will automatically revert to the previous splashscreen

### Updated Packages
- `toltec-bootstrap` - 0.2.3-1 (#740)
- `rmfm` - 1.5.0-2 (#700 #746)
- `whiteboard-hypercard` - 0.3.7-2 (#700 #747)
- `yaft` - 0.0.10-2 (#700 #736)
- `xochitl` - 0.0.0-16 (#700 #707)
- `reboot-guard` - 1.0.1-7 (#689)
- `calculator` - 0.0.0-16 (#700)
- `chessmarkable` - 0.8.0-2 (#700)
- `doomarkable` - 0.4.1-2 (#700)
- `fingerterm` - 1.3.5-15 (#700)
- `keywriter` - 0.2~20-gddc9e73-2 (#700)
- `koreader` - 2023.08-2 (#700)
- `netsurf` - 0.4.0-3 (#700)
- `erode`, `fret`, `oxide`, `rot`, `tarnish`, `decay`, `corrupt`, `anxiety`, `oxide-utils`, `inject_evdev`, and `liboxide` - 0.2.6-2 (#700 #745)
- `plato` - 0.9.34-2 (#700)
- `puzzles` - 0.2.2-4 (#700)
- `recrossable` - 0.0.0-8 (#700)
- `regenda` - 0.0.2-2 (#700)
- `reterm` - 20230628.1927-2 (#700)
- `retris` - 0.6.3-4 (#700)
- `dumbskull` - 0.0.1-3 (#700)
- `harmony` - 0.2.2-2 (#700)
- `mines` - 0.1.4-3 (#700)
- `nao` - 0.1.2-4 (#700)
- `rpncalc` - 0.0.3-3 (#700)
- `wordlet` - 0.0.2-3 (#700)
- `sill` - 0.1.1-1 (#700)
- `vnsee` - 0.4.1-2 (#700)
- `wikipedia` - 0.1.0-4 (#700)
- `zshelf` - 0.4.0-4 (#700)
- `changescrn` - 1.0.0-2 (#724)

### Tooling
- Packages that contain files in `/opt/etc/draft` or `/opt/usr/share/applications` will now automatically reload oxide applications as part of install, upgrade, and remove.

### Documentation
- Add documentation for the reload-oxide-apps hook.
- Update category list to include the new splashscreens category.

### Known Issues
- lowbattery and starting splashscreens don't work since they need to be in a specific bmp format and put in `/var/lib/uboot` (pr0fsmith/rMscreens#7)
- Installing two splashscreens of the same type will error instead of replacing the previously installed splashscreen (#761)
- Fingerterm icon is incorrect (#762)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jayy001 Jayy001 Jayy001 approved these changes

Assignees
No one assigned
Labels
packages Add or improve packages of the repository
Projects
None yet
Milestone
2023-W47 Merge window
Development

Successfully merging this pull request may close these issues.
3 participants
@Eeems @TheSunCat @Jayy001