summaryrefslogtreecommitdiff
path: root/package/nut
diff options
context:
space:
mode:
Diffstat (limited to 'package/nut')
-rw-r--r--package/nut/Config.in210
-rw-r--r--package/nut/Makefile34
-rw-r--r--package/nut/files/upsd.init2
3 files changed, 20 insertions, 226 deletions
diff --git a/package/nut/Config.in b/package/nut/Config.in
deleted file mode 100644
index 9539f8a03..000000000
--- a/package/nut/Config.in
+++ /dev/null
@@ -1,210 +0,0 @@
-config ADK_PACKAGE_NUT
- prompt "nut............................... Network UPS Tools"
- tristate
- default n
- help
- Network UPS Tools is a collection of programs which provide a common
- interface for monitoring and administering UPS hardware. It uses a
- layered approach to connect all of the parts.
-
- http://www.networkupstools.org
-
-config ADK_PACKAGE_NUT_SSL
- prompt "nut-ssl........................... Build Nut with SSL support"
- boolean
- default n
- depends on ADK_PACKAGE_NUT
- select ADK_PACKAGE_LIBOPENSSL
-
-config ADK_PACKAGE_NUT_USB
- prompt "nut-usb........................... Build Nut with USB drivers"
- boolean
- default n
- depends on ADK_PACKAGE_NUT
- select ADK_PACKAGE_LIBUSB
- help
- This option enables two drivers, namely hidups and energizerups.
-
-config ADK_PACKAGE_NUT_SNMP
- prompt "nut-snmp.......................... Build Nut with SNMP UPS driver"
- boolean
- default n
- depends on ADK_PACKAGE_NUT
- select ADK_PACKAGE_LIBNETSNMP
- help
- This option enables the snmp-ups driver.
-
-config ADK_PACKAGE_NUT_VARDESC
- prompt "command descriptions.............. Include variable and command descriptions"
- boolean
- default y
- depends on ADK_PACKAGE_NUT
- help
- With this option enabled, an optional file will be added to the package
- containing a description of the commands and variables to clients.
- If you leave this out, clients will receive "Unavailable" for any description
- requests.
-
-menu "UPS Drivers to include"
-depends on ADK_PACKAGE_NUT
-
-config ADK_PACKAGE_NUT_DRIVER_APCSMART
- prompt "apcsmart.......................... Driver for APC smart protocol (newapc)"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_BELKIN
- prompt "belkin............................ Driver for Belkin Smart-UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_BELKINUNV
- prompt "belkinunv......................... Driver for Belkin Universal UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_BESTUPS
- prompt "bestups........................... Driver for Best-UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_BESTFCOM
- prompt "bestfcom.......................... Driver for Best Power F-Command UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_BESTUFERRUPS
- prompt "bestuferrups...................... Driver for Best Power Micro-Ferrups"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_CYBERPOWER
- prompt "cyberpower........................ Driver for Cyber Power Systems"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_ETAPRO
- prompt "etapro............................ Driver for ETA UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_EVERUPS
- prompt "everups........................... Driver for Ever UPS models"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_GAMATRONIC
- prompt "gamatronic........................ Driver for Gamatronic UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_GENERICUPS
- prompt "genericups........................ Driver for generic contact-closure UPS models"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_ISBMEX
- prompt "isbmex............................ Driver for SOLA/BASIC Mexico models"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_LIEBERT
- prompt "liebert........................... Driver for Liebert UPS via MultiLink cable"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_MASTERGUARD
- prompt "masterguard....................... Driver for Masterguard units"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_MEGATEC
- prompt "megatec........................... Driver for Megatec protocol based UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_METASYS
- prompt "metasys........................... Driver for Meta System UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_MGE_UTALK
- prompt "mge-utalk......................... Driver for MGE UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_ONEAC
- prompt "oneac............................. Driver for UPS using the Oneac Advanced Interface"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_POWERCOM
- prompt "powercom.......................... Driver for Powercom units (see help)"
- boolean
- default n
- help
- This driver supports the following units:
- * -Trust 425/625
- * -Powercom
- * -Advice Partner/King PR750
- * See http://www.advice.co.il/product/inter/ups.html for its specifications.
- * This model is based on PowerCom (www.powercom.com) models.
- * -Socomec Sicon Egys 420
-
-config ADK_PACKAGE_NUT_DRIVER_POWERMUST
- prompt "powermust......................... Driver for Powermust"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_POWERPANEL
- prompt "powerpanel........................ Driver for Powerpanel units"
- boolean
- default n
- help
-
-config ADK_PACKAGE_NUT_DRIVER_RHINO
- prompt "rhino............................. Driver for Microsol Rhino UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_SAFENET
- prompt "safenet........................... Driver for SafeNet UPS (see help)"
- boolean
- default n
- help
- Supports the following units:
- * - Fairstone L525/-625/-750
- * - Fenton P400/-600/-800
- * - Gemini UPS625/-1000
- * - Powerwell PM525A/-625A/-800A/-1000A/-1250A
- * - Repotec RPF525/-625/-800/-1000
- * - Soltec Winmate 525/625/800/1000
- * - Sweex 500/1000
- * - others using SafeNet software and serial interface
-
-config ADK_PACKAGE_NUT_DRIVER_SOLIS
- prompt "solis............................. Driver for Microsol Solis UPS"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_TRIPPLITE
- prompt "tripplite......................... Driver for Tripp Lite SmartUPS models"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_TRIPPLITESU
- prompt "tripplitesu....................... Driver for Tripp Lite SmartOnline (SU*) models"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_UPSCODE2
- prompt "upscode2.......................... Driver for UPS using UPScode II command set"
- boolean
- default n
-
-config ADK_PACKAGE_NUT_DRIVER_VICTRONUPS
- prompt "victronups........................ Driver for GE/IMV/Victron units"
- boolean
- default n
-
-endmenu
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 8c0c2c7c6..e06a5784f 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -9,22 +9,27 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66
PKG_DESCR:= Network UPS Tools
PKG_SECTION:= sys
-PKG_URL:= http://www.networkupstools.org
-PKG_SITES:= http://www.networkupstools.org/source/2.4/
-
-include ${TOPDIR}/mk/package.mk
-
-ifneq (${ADK_PACKAGE_NUT_SNMP},)
-PKG_DEPENDS+= libnetsnmp
+ifneq (${ADK_PACKAGE_NUT_SSL},)
+PKG_DEPENDS+= libopenssl
+PKG_BUILDDEP+= openssl
endif
-
ifneq (${ADK_PACKAGE_NUT_USB},)
-PKG_DEPENDS+= libusb
+PKG_DEPENDS+= libusb
+PKG_BUILDDEP+= libusb
endif
-
-ifneq (${ADK_PACKAGE_NUT_SSL},)
-PKG_DEPENDS+= libopenssl
+ifneq (${ADK_PACKAGE_NUT_SNMP},)
+PKG_DEPENDS+= libnetsnmp
+PKG_BUILDDEP+= net-snmp
endif
+PKG_URL:= http://www.networkupstools.org
+PKG_SITES:= http://www.networkupstools.org/source/2.4/
+
+PKG_FLAVOURS:= SSL SNMP USB
+PKGFD_SSL:= enable SSL support
+PKGFD_SNMP:= enable SNMP support
+PKGFD_USB:= enable USB support
+
+include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,NUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -74,7 +79,6 @@ INSTALL_DRIVERS_tmp+= snmp-ups
endif
INSTALL_DRIVERS=$(shell echo ${INSTALL_DRIVERS_tmp} | tr ' ' ',')
-CONFIGURE_STYLE:= gnu
CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \
--without-cgi \
--with-drivers=${INSTALL_DRIVERS} \
@@ -86,10 +90,10 @@ CONFIGURE_ARGS+= --with-ssl
CONFIGURE_ENV+= CPPFLAGS="${TCPPFLAGS} ${TLDFLAGS}"
MAKE_FLAGS+= SSL_CFLAGS="${TCPPFLAGS}" SSL_LDFLAGS="${TLDFLAGS} -lssl -lcrypto"
endif
-BUILD_STYLE:= auto
+
ALL_TARGET:= all
-INSTALL_STYLE:= auto
INSTALL_TARGET:= install
+
ifneq (${ADK_PACKAGE_NUT_USB},)
ALL_TARGET+= usb
INSTALL_TARGET+= install-usb
diff --git a/package/nut/files/upsd.init b/package/nut/files/upsd.init
index a65d1ad81..edd023eff 100644
--- a/package/nut/files/upsd.init
+++ b/package/nut/files/upsd.init
@@ -16,7 +16,7 @@ start)
/usr/sbin/upsd || exit 2
;;
stop)
- /usr/sbin/upsd -c stop || killall upsd
+ /usr/sbin/upsd -c stop || pkill upsd
/usr/bin/upsdrvctl stop
;;
restart)