From patchwork Wed Dec 25 13:48:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8372 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4YJCll07jTz3wxg for ; Wed, 25 Dec 2024 13:48:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4YJClf0r6Kz4YX; Wed, 25 Dec 2024 13:48:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4YJCld3YZqz34LJ; Wed, 25 Dec 2024 13:48:45 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4YJClW2LV7z34Jy for ; Wed, 25 Dec 2024 13:48:39 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4YJClW0sntz1FV; Wed, 25 Dec 2024 13:48:39 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1735134519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Se4QVgq8AR9hOxJU+U5DBuz9GPFMJ8+Q7MG0B8TQ9M0=; b=z0hLNy3Ft7S6X47Gn5R8xiwc7J70nxqeUcErSf9ZGqZR2HQZ5tBmsA7srgvl5h6YwnkX8m roKocDdQZkZskKDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1735134519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Se4QVgq8AR9hOxJU+U5DBuz9GPFMJ8+Q7MG0B8TQ9M0=; b=WuTKs0HVSG8AX6rDSZJRutB38E+8C2HmAADrd7mcUVXjPDiiTtQHtRFWHf6IYV2y8SvRsP mai4Gd+BdvONrdAAOMASZm4xkGMRQcr1YXIUhBRh32V+2HFdphvcFolij7E5mPVLToI8ma nFMsuCm6bKchlN/qnzxLz6L5vQ8ZRKgIiAeRP6SvuAZH0K8Q522/Z4a232AoXHR0eFNXZL JQbUGnR58pQwKSR8VQfRoIIqz73CY0HXvD1e4lh2PA8ZKz670McYLeK0QB1bl1Q7evb5QW dVB2ipOuG+ZJGG0nJGIJrgMdu3GtxxccEDLsXM6pT61b6UM4smzqvL3z+VEinA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 7/7] nut: Update to enable collectd to find the nut files Date: Wed, 25 Dec 2024 14:48:28 +0100 Message-ID: <20241225134828.6231-7-adolf.belka@ipfire.org> In-Reply-To: <20241225134828.6231-1-adolf.belka@ipfire.org> References: <20241225134828.6231-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: Z35GPOB6XHDFQUFEUNJPQSBZMPQWFRKS X-Message-ID-Hash: Z35GPOB6XHDFQUFEUNJPQSBZMPQWFRKS X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - with-dev is required as a configure option to ensure that the package-config files are installed during the build so that collectd can find the libupsclient library files which are needed for the nut plugin. Signed-off-by: Adolf Belka --- config/rootfiles/packages/nut | 16 +++++++++++++++- lfs/nut | 21 +++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index 4d1d17887..240182619 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -54,7 +54,6 @@ usr/bin/riello_usb usr/bin/safenet usr/bin/skel usr/bin/sms_ser -usr/bin/snmp-ups usr/bin/solis usr/bin/tripplite usr/bin/tripplite_usb @@ -67,6 +66,15 @@ usr/bin/upsrw usr/bin/upssched-cmd usr/bin/usbhid-ups usr/bin/victronups +#usr/include/nut-scan.h +#usr/include/nutclient.h +#usr/include/nutclientmem.h +#usr/include/nutscan-device.h +#usr/include/nutscan-init.h +#usr/include/nutscan-ip.h +#usr/include/nutscan-serial.h +#usr/include/parseconf.h +#usr/include/upsclient.h #usr/lib/libnutclient.la #usr/lib/libnutclient.so usr/lib/libnutclient.so.2 @@ -83,8 +91,13 @@ usr/lib/libnutscan.so.2.0.5 #usr/lib/libupsclient.so usr/lib/libupsclient.so.6 usr/lib/libupsclient.so.6.0.1 +#usr/lib/pkgconfig/libnutclient.pc +#usr/lib/pkgconfig/libnutclientstub.pc +#usr/lib/pkgconfig/libnutscan.pc +#usr/lib/pkgconfig/libupsclient.pc #usr/lib/python3.10/site-packages/PyNUT.py #usr/lib/python3.10/site-packages/test_nutclient.py +#usr/libexec/sockdebug usr/sbin/upsd usr/sbin/upsdrvctl usr/sbin/upsmon @@ -93,3 +106,4 @@ usr/share/cmdvartab usr/share/driver.list var/ipfire/backup/addons/includes/nut var/state/ups +usr/bin/snmp-ups diff --git a/lfs/nut b/lfs/nut index 732211628..23b9e6a75 100644 --- a/lfs/nut +++ b/lfs/nut @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 12 +PAK_VER = 13 DEPS = @@ -85,15 +85,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/nut \ - --with-usb \ - --with-user=root \ - --with-group=nut \ - --with-wrap=no \ - --with-udev-dir=/etc/udev \ - --disable-static \ - --without-docs + --prefix=/usr \ + --sysconfdir=/etc/nut \ + --with-usb \ + --with-user=root \ + --with-group=nut \ + --with-wrap=no \ + --with-udev-dir=/etc/udev \ + --disable-static \ + --without-docs \ + --with-dev cd $(DIR_APP) && make #$(MAKETUNING) cd $(DIR_APP) && make install # sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules