Commit Graph

8 Commits

Author SHA1 Message Date
Tianling Shen 187b52c95a
btop: Update to 1.3.2
Synced LDFLAGS from upstream Makefile.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2024-02-20 15:49:07 +08:00
Tianling Shen 37ce0e6803
btop: Update to 1.3.0
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2024-01-08 11:49:37 +08:00
Javier Marcet 107312a73f btop: opt out of lto usage
Signed-off-by: Javier Marcet <javier@marcet.info>
2023-07-10 15:32:33 +08:00
Nick Hainke feaba4f52b btop: fix compilation with musl 1.2.4
_LARGEFILE64_SOURCE has to be defined in the source, or CFLAGS can be used
to pass -D_LARGEFILE64_SOURCE to allow to keep using LFS64 definitions.

Fixes errors in the form of:
Compiling src/linux/btop_collect.cpp
src/linux/btop_collect.cpp: In function 'Mem::mem_info& Mem::collect(bool)':
src/linux/btop_collect.cpp:1082:58: error: aggregate 'Mem::collect(bool)::statvfs64 vfs' has incomplete type and cannot be defined
 1082 |                                         struct statvfs64 vfs;
      |                                                          ^~~
src/linux/btop_collect.cpp:1083:79: error: invalid use of incomplete type 'struct Mem::collect(bool)::statvfs64'
 1083 |                                         if (statvfs64(mountpoint.c_str(), &vfs) < 0) {
      |                                                                               ^
src/linux/btop_collect.cpp:1082:48: note: forward declaration of 'struct Mem::collect(bool)::statvfs64'
 1082 |                                         struct statvfs64 vfs;
      |                                                ^~~~~~~~~
make[3]: *** [Makefile:274: obj/linux/btop_collect.o] Error 1
make[3]: Leaving directory '/home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/btop-1.2.13'
make[2]: *** [Makefile:53: /home/nick/openwrt/build_dir/target-aarch64_cortex-a53_musl/btop-1.2.13/.built] Error 2
make[2]: Leaving directory '/home/nick/openwrt/feeds/packages/admin/btop'
time: package/feeds/packages/btop/compile#2.57#0.17#3.02
    ERROR: package/feeds/packages/btop failed to build.

Signed-off-by: Nick Hainke <vincent@systemli.org>
2023-05-17 07:46:11 +08:00
Paul Fertser 0c10c224be treewide: remove AUTORELEASE
Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used.

The following temporary change was made to the core:

diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
 abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))

 COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))

 all:
 FORCE: ;

And this command used to fix affected packages:

for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \
                              sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
  make package/$i/download
done

Signed-off-by: Paul Fertser <fercerpav@gmail.com>
2023-04-21 22:46:58 +02:00
Tianling Shen bb73523d75 btop: Update to 1.2.13
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-11-15 14:33:04 +08:00
Tianling Shen 5671bd0d1a btop: append `--utf-force` argument by default
btop reads the `LANG` env variable to delect if the system has utf8
support, which exists on common Linux distributions.

However, OpenWrt does not ship it, and results in btop reporting
"No UTF-8 locale detected!". Users have to manually pass `--utf-force`
to make btop happy.

To make it OOTB, append `--utf-force` argument by default via alias.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-11-15 14:33:04 +08:00
Tianling Shen d04b590fc2 btop: add new package
Resource monitor that shows usage and stats for processor, memory,
disks, network and processes.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
2022-10-19 09:30:12 +02:00