pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

btop-git: add upstream patch.



Module Name:	pkgsrc-wip
Committed By:	Santhosh Raju <fox%NetBSD.org@localhost>
Pushed By:	fox
Date:		Thu Sep 24 12:17:13 2026 +0200
Changeset:	7ba05a93763e6b0c2d2b5f8b0f7da519e9d3f0f9

Modified Files:
	btop-git/Makefile
	btop-git/distinfo
Added Files:
	btop-git/patches/patch-src_netbsd_btop__collect.cpp-only-physical

Log Message:
btop-git: add upstream patch.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7ba05a93763e6b0c2d2b5f8b0f7da519e9d3f0f9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 btop-git/Makefile                                  |  2 +-
 btop-git/distinfo                                  |  1 +
 ...atch-src_netbsd_btop__collect.cpp-only-physical | 44 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diffs:
diff --git a/btop-git/Makefile b/btop-git/Makefile
index 8b6f6d7333..bdf6fc79cf 100644
--- a/btop-git/Makefile
+++ b/btop-git/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	btop-1.4.7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=aristocratos/}
-GITHUB_TAG=	9527231dfbcbe697f8eb80849e267377194e6ca8
+GITHUB_TAG=	612e18f5bd598fe987b30d041b39e5d7b3e0794f
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/aristocratos/btop
diff --git a/btop-git/distinfo b/btop-git/distinfo
index 226f0aa50a..df78e0d38b 100644
--- a/btop-git/distinfo
+++ b/btop-git/distinfo
@@ -6,3 +6,4 @@ Size (btop-1.4.7-6e39144aaf5a6bc01b9f795010b0914431067183.tar.gz) = 1280353 byte
 SHA1 (patch-Makefile) = 8220b2a9b2ff0bbef5b94efa3310144ccf75d07b
 SHA1 (patch-src_btop.cpp) = bd854848d69b3725e23f9af3736c9ae0a8787776
 SHA1 (patch-src_netbsd_btop__collect.cpp) = e097c005ac69be8ba34a9c13f2471036e8f06c93
+SHA1 (patch-src_netbsd_btop__collect.cpp-only-physical) = 4271ed99dffc153ad1f94515fdc5e55a2f2401cc
diff --git a/btop-git/patches/patch-src_netbsd_btop__collect.cpp-only-physical b/btop-git/patches/patch-src_netbsd_btop__collect.cpp-only-physical
new file mode 100644
index 0000000000..d743c2f195
--- /dev/null
+++ b/btop-git/patches/patch-src_netbsd_btop__collect.cpp-only-physical
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_netbsd_btop__collect.cpp,v 1.3 2026/09/24 09:43:26 wiz Exp $
+
+https://github.com/aristocratos/btop/pull/1852
+
+--- src/netbsd/btop_collect.cpp.orig	2026-05-01 16:05:43.000000000 +0000
++++ src/netbsd/btop_collect.cpp
+@@ -627,8 +627,6 @@ namespace Mem {
+ 
+ namespace Mem {
+ 	bool has_swap = false;
+-	vector<string> fstab;
+-	fs::file_time_type fstab_time;
+ 	int disk_ios = 0;
+ 	vector<string> last_found;
+ 
+@@ -756,7 +754,7 @@ namespace Mem {
+ 			double uptime = system_uptime();
+ 			auto &disks_filter = Config::getS("disks_filter");
+ 			bool filter_exclude = false;
+-			// auto only_physical = Config::getB("only_physical");
++			auto only_physical = Config::getB("only_physical");
+ 			auto &disks = mem.disks;
+ 			vector<string> filter;
+ 			if (not disks_filter.empty()) {
+@@ -773,15 +771,14 @@ namespace Mem {
+ 			found.reserve(last_found.size());
+ 			for (int i = 0; i < count; i++) {
+ 				auto fstype = string(stvfs[i].f_fstypename);
+-				if (fstype == "autofs" || fstype == "devfs" || fstype == "linprocfs" || fstype == "procfs" || fstype == "tmpfs" || fstype == "linsysfs" ||
+-					fstype == "fdesckfs") {
+-					// in memory filesystems -> not useful to show
++				string dev = stvfs[i].f_mntfromname;
++				//? Physical = backed by a block device (source under /dev/, or the kernel's root_device placeholder before rc.d/root remounts /) or ZFS (source is pool[/dataset]).
++				//? Pseudo (kernfs, ptyfs, tmpfs, procfs, ...) and network (host:/path) filesystems have other sources.
++				if (only_physical and not dev.starts_with("/dev/") and dev != "root_device" and fstype != "zfs")
+ 					continue;
+-				}
+ 
+ 				std::error_code ec;
+ 				string mountpoint = stvfs[i].f_mntonname;
+-				string dev = stvfs[i].f_mntfromname;
+ 				mapping[dev] = mountpoint;
+ 
+ 				//? Match filter if not empty


Home | Main Index | Thread Index | Old Index