diff mbox series

[7/7] nut: Update to enable collectd to find the nut files

Message ID 20241225134828.6231-7-adolf.belka@ipfire.org
State New
Headers
Series [1/7] collectd: Update to version 5.12.0 |

Commit Message

Adolf Belka Dec. 25, 2024, 1:48 p.m. UTC 
  - 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 <adolf.belka@ipfire.org>
---
 config/rootfiles/packages/nut | 16 +++++++++++++++-
 lfs/nut                       | 21 +++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)
diff mbox series

Patch

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