From fa1791dbc8d8149beef3763a7ac4e6a80bd24a15 Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Tue, 31 Aug 2021 00:38:39 -0400 Subject: [PATCH] htop: Add HTOP_LMSENSORS config option Enabled by default for x86, this enables lm-sensors support in htop. Also add --enable-linux-affinity to avoid autodetecting it Signed-off-by: Etienne Champetier (cherry picked from commit 37ca4e923d2efe21a4c6c8d8d9ab8b6720a4cd3a) --- admin/htop/Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/admin/htop/Makefile b/admin/htop/Makefile index 165d7120d5..b1041f72d1 100644 --- a/admin/htop/Makefile +++ b/admin/htop/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=htop PKG_VERSION:=3.0.5 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/htop-dev/htop/tar.gz/$(PKG_VERSION)? @@ -24,6 +24,9 @@ PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_CONFIG_DEPENDS:= CONFIG_HTOP_LMSENSORS +PKG_BUILD_DEPENDS:= HTOP_LMSENSORS:lm-sensors + include $(INCLUDE_DIR)/package.mk define Package/htop @@ -41,7 +44,20 @@ define Package/htop/description see all processes and their full command lines. endef +define Package/htop/config + config HTOP_LMSENSORS + bool "Compile Htop with lm-sensors support" + depends on PACKAGE_htop + default y if TARGET_x86 + help + Build htop with lm-sensors support. + This doesn't add lm-sensors as dependency, + if present it'll loaded using dlopen(). +endef + CONFIGURE_ARGS += \ + --with-sensors=$(if $(CONFIG_HTOP_LMSENSORS),yes,no) \ + --enable-linux-affinity \ --disable-unicode \ --disable-hwloc -- 2.30.2