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

synocli-file: update tools and remove fd-find for hi3535 #6372

Merged
merged 3 commits into from
Jan 19, 2025

Conversation

hgy59
Copy link
Contributor

@hgy59 hgy59 commented Jan 5, 2025

Description

  • allow current rust version for ARMv7L archs (avoid limit to 1.77.2)
  • Remove fd (fd-find) for VS and NVR models (ARMv7L archs)
  • Update eza to v0.20.15
  • Update file to v5.46
  • Update fzf to v0.57.0
  • Update nano to v8.3
  • Update nnn to v5.0 (DSM 7 only)
  • Update tree to v2.2.1

Fixes #

Checklist

  • Build rule all-supported completed successfully (only mkvtoolnix as dependency of cross/file fails to download boost libraries)
  • New installation of package completed successfully
  • Package upgrade completed successfully (Manually install the package again)
  • Package functionality was tested
  • Any needed documentation is updated/created

Type of change

  • Package update
  • Includes small framework changes

- allow current rust version for ARMv7L archs (avoid limit to 1.77.2)
- Remove fd (fd-find) for VS and NVR models (ARMv7L archs)
- Update eza to v0.20.15
- Update file to v5.46
- Update fzf to v0.57.0
- Update nano to v8.3
- Update nnn to v5.0 (DSM 7 only)
- Update tree to v2.2.1
- not supported for ARMv5 anymore
@hgy59 hgy59 requested a review from th0ma7 January 6, 2025 12:52
@hgy59
Copy link
Contributor Author

hgy59 commented Jan 18, 2025

@th0ma7 I requested your review because this PR will make #6364 obsolete.

Copy link
Contributor

@th0ma7 th0ma7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -47,7 +47,6 @@ ifeq ($(findstring $(RUST_ARCH), $(ARMv7_ARCHS)),$(RUST_ARCH))
RUST_TARGET = armv7-unknown-linux-gnueabihf
endif
ifeq ($(findstring $(RUST_ARCH), $(ARMv7L_ARCHS)),$(RUST_ARCH))
RUSTUP_DEFAULT_TOOLCHAIN = 1.77.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remind me, removing this constraint works for armv7l ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it works.
With the constraint, bat (synocli-file) and dua (synocli-disk) fail for ARMv7L.
package home v0.5.11 cannot be built because it requires rustc 1.81 or newer, while the currently active rustc version is 1.77.2

TODO: synocli-disk has to drop support for dua for ARMv5 (does not support rust > 1.77.2, as you mentioned)

@hgy59 hgy59 merged commit 3532152 into SynoCommunity:master Jan 19, 2025
15 checks passed
@hgy59 hgy59 added the status/published Published and activated (may take up to 48h until visible in DSM package manager) label Jan 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/published Published and activated (may take up to 48h until visible in DSM package manager) synocli-file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants