8000 Remove package: bottom by gbyl · Pull Request #897 · toltec-dev/toltec · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Remove package: bottom #897

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

Merged
merged 7 commits into from
Jun 10, 2024
Merged

Remove package: bottom #897

merged 7 commits into from
Jun 10, 2024

Conversation

gbyl
Copy link
@gbyl gbyl commented Jun 9, 2024

bottom was recently added to Entware.

The only caveat is that Entware's bottom gets installed in /opt/usr/bin/btm which is not included in the $PATH set by Toltec.

@Eeems
Copy link
Member
Eeems commented Jun 9, 2024

The only caveat is that Entware's bottom gets installed in /opt/usr/bin/btm which is not included in the $PATH set by Toltec.

That appears to be an upstream bug, as /opt/etc/profile only adds /opt/bin and /opt/sbin to the path.

@gbyl
Copy link
Author
gbyl commented Jun 9, 2024

That would be my guess too going by this file. There is a second caveat too. Entware's btm, just as with ripgrep, expects the libraries to be in the host system. So, to run it successfully in the remarkable it needs to be run like so: LD_LIBRARY_PATH="/opt/lib" /opt/usr/bin/btm

@Eeems
Copy link
Member
Eeems commented Jun 9, 2024

Have you opened upstream issues for either of the packages yet? That said, I didn't have the same issue you did with ripgrep on 3.3.2, I was able to run it without issue.

@gbyl
Copy link
Author
gbyl commented Jun 9, 2024

Unfortunately, I don't understand Entware well enough to open a productive issue. Thank you for testing ripgrep though! The issue might just be in my device after all. I would have to retest on a fresh install.

As far as this PR goes, btm is available directly from Entware. So, we can merge it to avoid duplicating efforts, right?

@Eeems
Copy link
Member
Eeems commented Jun 9, 2024

Unfortunately, I don't understand Entware well enough to open a productive issue. Thank you for testing ripgrep though! The issue might just be in my device after all. I would have to retest on a fresh install.

As far as this PR goes, btm is available directly from Entware. So, we can merge it to avoid duplicating efforts, right?

I've done some looking for /opt/usr/bin in the entware repo, and it seems to be an expected path: https://github.com/search?q=repo%3AEntware%2FEntware%20%2Fopt%2Fusr%2Fbin&type=code

It's still not part of /opt/etc/profile which is part of the entware-opt package: https://github.com/Entware/rtndev/blob/4f0e97fc9ddb46317ea7c4752a81ad3e5dc52044/entware-opt/files/profile#L16-L23

It would probably still be worth it open an upstream issue asking about this discrepancy. For this PR though, we can easily add a file to toltec-base to add it to the path, similar to how we load the entware profile:

ln -sf /opt/etc/profile /etc/profile.d/toltec.sh

@gbyl
Copy link
Author
gbyl commented Jun 9, 2024

we can easily add a file to toltec-base to add it to the path, similar to how we load the entware profile

I was not able to figure out how to accomplish this. Could you push that change to this PR? I would like to see the solution you had in mind.

Also, I found a minor typo while testing solutions. Since it is such a small change, could we include it with this PR?

@Eeems
Copy link
Member
Eeems commented Jun 9, 2024

we can easily add a file to toltec-base to add it to the path, similar to how we load the entware profile

I was not able to figure out how to accomplish this. Could you push that change to this PR? I would like to see the solution you had in mind.

I will try to get to that sometime soon.

Also, I found a minor typo while testing solutions. Since it is such a small change, could we include it with this PR?

Sure, but the toltec-bootstrap package will need to have its version number bumped to make the package build.

@Eeems
Copy link
Member
Eeems commented Jun 9, 2024

The version number would need to be the one bumped, as the package sources have had a change. The pkgrel is only for when there are no changes to the source, and it was just adjustments to the package recipe.
https://github.com/toltec-dev/toltec/blob/stable/docs/package.md#pkgver-field

@Eeems Eeems added this to the 2024-W23 Merge Window milestone Jun 10, 2024
@Eeems Eeems merged commit 28ebda4 into toltec-dev:testing Jun 10, 2024
3 checks passed
@gbyl
Copy link
Author
gbyl commented Jun 10, 2024

Thank you for those commits @Eeems! I would not have guessed that implementation. Also, I reflashed my device, and no longer see those library errors with ripgrep. As you recommended, I tested the new toltecmk too and it works great.

@gbyl gbyl deleted the remove-btm branch June 10, 2024 13:48
Eeems added a commit that referenced this pull request Jun 27, 2024
* remove package: bottom

* fix toltecctl typo

* Create opt-usr-bin.sh

---------

Co-authored-by: gbyl <gbyl@users.noreply.github.com>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Eeems added a commit that referenced this pull request Jun 29, 2024
* remove package: bottom

* fix toltecctl typo

* Create opt-usr-bin.sh

---------

Co-authored-by: gbyl <gbyl@users.noreply.github.com>
Co-authored-by: Nathaniel van Diepen <Eeems@users.noreply.github.com>
Eeems added a commit that referenced this pull request Sep 5, 2024
### New Packages
- `bandwich` - 0.22.2-1 (#892)
- `sysfs_preload` - 1.0.1-1 (#833)

### Updated Packages
- `7zip` - 23.01-2 (#890)
- `display`, and `rm2fb-client` - 1:0.0.33-3 (#741 #833)
- `koreader` - 2024.04-5 (#894)
- `lf` - r32-1 (#889)
- `oxide`, `oxide-extra`, `oxide-utils`, `inject_evdev`, `liboxide`, `liboxide-dev` - 2.8.4-2 (#833 #903)
- `libsentry` - 0.7.6-1 (#833 #903 )
- `bufshot` - 0.1.2-3 (#898)
- `dumbskull` - 0.0.1-4 (#898)
- `genie` - 0.1.7-2 (#898)
- `harmony` - 0.2.3-2 (#898)
- `iago` - 0.1.2-2 (#898)
- `lamp` - 0.1.1-3 (#898)
- `mines` - 0.1.4-4 (#898)
- `remux` - 0.3.0-6 (#898 #882)
- `rpncalc` - 0.0.3-4 (#898)
- `simple` - 0.2.1-2 (#898)
- `wordlet` - 0.0.2-4 (#898)
- `toltec-base` - 1.4-1 (#897)
- `toltec-bootstrap` - 0.4.5-1 (#897)
- `toltec-deletion` - 0.1-7 (#887)
- `xochitl` - 0.0.0-21 (#833)

### Packages Removed
- `bottom` - Entware now provides this package
- `ripgrep` - Entware now provides this package

### Tooling
- Update build process to use toltecmk (#789).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0