diff options
author | multi <depot@in-addr.xyz> | 2020-11-17T23·56+0000 |
---|---|---|
committer | multi <depot@in-addr.xyz> | 2020-11-18T00·29+0000 |
commit | 4331bc8da76ae67a43d64ff5355598a2699a647f (patch) | |
tree | 2db05805958d2be1992bd6b827de8801f9097e71 /users/multi/pkgs/htop/zfs-arc-stats/0009-Linux-fixes.patch | |
parent | 73c862279aad7aa4c87bfe5ae2c69a0f56bb59df (diff) |
chore(users/multi): Update htop derivation for new upstream. r/1883
- htop has moved upstreams, which has been producing new releases, so update the derivation to pull from the new repository on GitHub. - All of the patches I have locally have been merged upstream, so drop them from the depot. - Pull from a reasonably recent git commit instead of from a numbered release, as the ZFS ARC stats and CPU meter columnation patches haven't made it into a release yet. Change-Id: I66ad4c035df07709abf4f75a9d4e1486920091d0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2105 Reviewed-by: multi <depot@in-addr.xyz> Tested-by: BuildkiteCI
Diffstat (limited to 'users/multi/pkgs/htop/zfs-arc-stats/0009-Linux-fixes.patch')
-rw-r--r-- | users/multi/pkgs/htop/zfs-arc-stats/0009-Linux-fixes.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/users/multi/pkgs/htop/zfs-arc-stats/0009-Linux-fixes.patch b/users/multi/pkgs/htop/zfs-arc-stats/0009-Linux-fixes.patch deleted file mode 100644 index 368b60279018..000000000000 --- a/users/multi/pkgs/htop/zfs-arc-stats/0009-Linux-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a267003f2f38df5d52ae3f07658c1bbd20b5fb5e Mon Sep 17 00:00:00 2001 -From: Ross Williams <ross@ross-williams.net> -Date: Tue, 3 Sep 2019 19:56:38 +0000 -Subject: [PATCH 9/9] Linux fixes - ---- - linux/LinuxProcessList.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c -index 4596c3b..1d5700e 100644 ---- a/linux/LinuxProcessList.c -+++ b/linux/LinuxProcessList.c -@@ -988,10 +988,10 @@ static inline void LinuxProcessList_scanZfsArcstats(LinuxProcessList* lpl) { - switch (buffer[0]) { - case 'c': - tryRead("c_max", &lpl->zfs.max); -- tryReadFlag("compressed", &lpl->zfs.compressed, &lpl->zfs.isCompressed); -+ tryReadFlag("compressed_size", &lpl->zfs.compressed, lpl->zfs.isCompressed); - break; - case 'u': -- tryRead("uncompressed", &lpl->zfs.uncompressed); -+ tryRead("uncompressed_size", &lpl->zfs.uncompressed); - break; - case 's': - tryRead("size", &lpl->zfs.size); --- -2.20.1 - |